diff --git a/actions-services.yml b/actions-services.yml
index 5e47a067..b67396b1 100644
--- a/actions-services.yml
+++ b/actions-services.yml
@@ -31,7 +31,6 @@ services:
       MYSQL_USER: silauth
       MYSQL_PASSWORD: silauth
       PROFILE_URL_FOR_TESTS: http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub
-      ADMIN_EMAIL: john_doe@there.com
       ADMIN_PASS: b
       SECRET_SALT: abc123
       IDP_NAME: x
@@ -67,7 +66,6 @@ services:
       # Enable checking our test metadata
       - ./dockerbuild/run-metadata-tests.sh:/data/run-metadata-tests.sh
     environment:
-      ADMIN_EMAIL: "john_doe@there.com"
       ADMIN_PASS: "abc123"
       SECRET_SALT: "not-secret-h57fjemb&dn^nsJFGNjweJ"
       IDP_NAME: "Hub"
@@ -106,7 +104,6 @@ services:
       bash -c "whenavail db 3306 60 /data/vendor/simplesamlphp/simplesamlphp/modules/silauth/lib/Auth/Source/yii migrate --interactive=0 &&
       /data/run.sh"
     environment:
-      ADMIN_EMAIL: "john_doe@there.com"
       ADMIN_PASS: "a"
       SECRET_SALT: "not-secret-h57fjemb&dn^nsJFGNjweJ"
       IDP_NAME: "IDP 1"
@@ -145,7 +142,6 @@ services:
       - ./development/UserPass.php:/data/vendor/simplesamlphp/simplesamlphp/modules/exampleauth/lib/Auth/Source/UserPass.php
 
     environment:
-      ADMIN_EMAIL: "john_doe@there.com"
       ADMIN_PASS: "b"
       SECRET_SALT: "h57fjemb&dn^nsJFGNjweJ"
       IDP_NAME: "IDP 2"
@@ -167,7 +163,6 @@ services:
       - ./development/idp3-local/metadata/saml20-sp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-sp-remote.php
 
     environment:
-      ADMIN_EMAIL: "john_doe@there.com"
       ADMIN_PASS: "c"
       SECRET_SALT: "h57fjem34fh*nsJFGNjweJ"
       SECURE_COOKIE: "false"
@@ -190,7 +185,6 @@ services:
       # Enable checking our test metadata
       - ./dockerbuild/run-metadata-tests.sh:/data/run-metadata-tests.sh
     environment:
-      ADMIN_EMAIL: "john_doe@there.com"
       ADMIN_PASS: "sp1"
       SECRET_SALT: "not-secret-h57fjemb&dn^nsJFGNjweJz1"
       SECURE_COOKIE: "false"
@@ -212,7 +206,6 @@ services:
       - ./development/sp2-local/metadata/saml20-idp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php
 
     environment:
-      ADMIN_EMAIL: john_doe@there.com
       ADMIN_PASS: sp2
       SECRET_SALT: h57fjemb&dn^nsJFGNjweJz2
       SECURE_COOKIE: "false"
@@ -234,7 +227,6 @@ services:
       - ./development/sp3-local/metadata/saml20-idp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php
 
     environment:
-      ADMIN_EMAIL: john_doe@there.com
       ADMIN_PASS: sp3
       SECRET_SALT: h57fjemb&dn^nsJFGNjweJz3
       SECURE_COOKIE: "false"
@@ -255,7 +247,6 @@ services:
       # Utilize custom metadata
       - ./development/sp-local/metadata/saml20-idp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php
     environment:
-      ADMIN_EMAIL: john_doe@there.com
       ADMIN_PASS: sp1
       IDP_NAME: THIS VARIABLE IS REQUIRED BUT PROBABLY NOT USED
       SECRET_SALT: NOT-a-secret-k49fjfkw73hjf9t87wjiw
diff --git a/docker-compose.yml b/docker-compose.yml
index 945bc54c..08e1ca6f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,7 +40,6 @@ services:
       MYSQL_PASSWORD: silauth
       COMPOSER_CACHE_DIR: /composer
       PROFILE_URL_FOR_TESTS: http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub
-      ADMIN_EMAIL: john_doe@there.com
       ADMIN_PASS: b
       SECRET_SALT: abc123
       IDP_NAME: x
@@ -120,7 +119,6 @@ services:
     ports:
       - "80:80"
     environment:
-      ADMIN_EMAIL: "john_doe@there.com"
       ADMIN_PASS: "abc123"
       SECRET_SALT: "h57fjemb&dn^nsJFGNjweJ"
       IDP_NAME: "Hub"
@@ -169,7 +167,6 @@ services:
     ports:
       - "8085:80"
     environment:
-      ADMIN_EMAIL: "john_doe@there.com"
       ADMIN_PASS: "a"
       SECRET_SALT: "h57fjemb&dn^nsJFGNjweJ"
       IDP_NAME: "IDP 1"
@@ -218,7 +215,6 @@ services:
     ports:
       - "8086:80"
     environment:
-      ADMIN_EMAIL: "john_doe@there.com"
       ADMIN_PASS: "b"
       SECRET_SALT: "h57fjemb&dn^nsJFGNjweJ"
       IDP_NAME: "IDP 2"
@@ -251,7 +247,6 @@ services:
     env_file:
       - local.env
     environment:
-      ADMIN_EMAIL: "john_doe@there.com"
       ADMIN_PASS: "c"
       SECRET_SALT: "h57fjem34fh*nsJFGNjweJ"
       SECURE_COOKIE: "false"
@@ -284,7 +279,6 @@ services:
     ports:
       - "8081:80"
     environment:
-      ADMIN_EMAIL: "john_doe@there.com"
       ADMIN_PASS: "sp1"
       SECRET_SALT: "h57fjemb&dn^nsJFGNjweJz1"
       SECURE_COOKIE: "false"
@@ -315,7 +309,6 @@ services:
     ports:
       - "8082:80"
     environment:
-      ADMIN_EMAIL: "john_doe@there.com"
       ADMIN_PASS: "sp2"
       SECRET_SALT: "h57fjemb&dn^nsJFGNjweJz2"
       SECURE_COOKIE: "false"
@@ -340,7 +333,6 @@ services:
     env_file:
       - local.env
     environment:
-      ADMIN_EMAIL: john_doe@there.com
       ADMIN_PASS: sp3
       SECRET_SALT: h57fjemb&dn^nsJFGNjweJz3
       SECURE_COOKIE: "false"
@@ -362,7 +354,6 @@ services:
     ports:
       - "8084:80"
     environment:
-      ADMIN_EMAIL: john_doe@there.com
       ADMIN_PASS: sp1
       IDP_NAME: THIS VARIABLE IS REQUIRED BUT PROBABLY NOT USED
       SECRET_SALT: NOT-a-secret-k49fjfkw73hjf9t87wjiw
diff --git a/local.env.dist b/local.env.dist
index f037ef32..fc8485c6 100644
--- a/local.env.dist
+++ b/local.env.dist
@@ -1,10 +1,10 @@
 # These are Required
-ADMIN_EMAIL=
 ADMIN_PASS=
 IDP_NAME=
 SECRET_SALT=
 
 # These are Optional
+ADMIN_EMAIL=
 ADMIN_NAME=
 ADMIN_PROTECT_INDEX_PAGE=
 ANALYTICS_ID=