diff --git a/flake.nix b/flake.nix
index 5bd2cc4..13e45cc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,10 +58,6 @@
           HOST_PORT       = cfg.host_port;
           SSH_ROOT        = "skynet_old";
           
-          # Email stuff
-          EMAIL_SMTP      = cfg.mail.host;
-          EMAIL_USER      = cfg.mail.user;
-          
           # special categories of users
           USERS_ADMIN     = lib.strings.concatStringsSep "," cfg.users.admin;
           USERS_COMMITTEE = lib.strings.concatStringsSep "," cfg.users.committee;
@@ -86,6 +82,7 @@
             EnvironmentFile = [
               "${cfg.env.ldap}"
               "${cfg.env.discord}"
+              "${cfg.env.mail}"
             ];
           };
         });
@@ -120,37 +117,15 @@
           env = {
             ldap = mkOption rec {
               type        = types.str;
-              description = "Auth for the LDAP, has LDAP_ADMIN_PW";
+              description = "Auth for the LDAP, has LDAP_HOST, LDAP_ADMIN, LDAP_ADMIN_PW";
             };
             discord = mkOption rec {
               type        = types.str;
               description = "Auth for the discord bot, has LDAP_DISCORD_AUTH";
             };
-          };
-          
-          ldap = {
-            host = mkOption rec {
+            mail = mkOption rec {
               type        = types.str;
-              description = "LDAP Host";
-            };
-            
-            admin = mkOption rec {
-              type        = types.str;
-              description = "LDAP admin account dn";
-            };
-          };
-          
-          mail = {
-            host = mkOption rec {
-              type        = types.str;
-              default     = "mail.skynet.ie";
-              description = "Email Host";
-            };
-            
-            user = mkOption rec {
-              type        = types.str;
-              default     = "compsoc@skynet.ie";
-              description = "User for sending emails";
+              description = "Mail details, has EMAIL_SMTP, EMAIL_USER, EMAIL_PASS";
             };
           };
           
@@ -235,6 +210,7 @@
                 EnvironmentFile = [
                   "${cfg.env.ldap}"
                   "${cfg.env.discord}"
+                  "${cfg.env.mail}"
                 ];
               };
             };