diff --git a/development/idp-local/config/config.php b/development/idp-local/config/config.php
index 6a45092b..3511775c 100644
--- a/development/idp-local/config/config.php
+++ b/development/idp-local/config/config.php
@@ -22,11 +22,9 @@
 
 try {
     // Required to be defined in environment variables
-    $ADMIN_EMAIL = Env::get('ADMIN_EMAIL', 'na@example.org');
     $ADMIN_PASS = Env::requireEnv('ADMIN_PASS');
     $SECRET_SALT = Env::requireEnv('SECRET_SALT');
     $IDP_NAME = Env::requireEnv('IDP_NAME');
-    $IDP_DISPLAY_NAME = Env::get('IDP_DISPLAY_NAME', $IDP_NAME);
 } catch (EnvVarNotFoundException $e) {
 
     // Return error response code/message to HTTP request.
@@ -41,9 +39,10 @@
     exit($responseContent);
 }
 
-
 // Defaults provided if not defined in environment
+$IDP_DISPLAY_NAME = Env::get('IDP_DISPLAY_NAME', $IDP_NAME);
 $BASE_URL_PATH = Env::get('BASE_URL_PATH', '/');
+$ADMIN_EMAIL = Env::get('ADMIN_EMAIL', 'na@example.org');
 $ADMIN_NAME = Env::get('ADMIN_NAME', 'SAML Admin');
 $ADMIN_PROTECT_INDEX_PAGE = Env::get('ADMIN_PROTECT_INDEX_PAGE', true);
 $SHOW_SAML_ERRORS = Env::get('SHOW_SAML_ERRORS', false);
diff --git a/development/idp2-local/config/config.php b/development/idp2-local/config/config.php
index 6a45092b..3511775c 100644
--- a/development/idp2-local/config/config.php
+++ b/development/idp2-local/config/config.php
@@ -22,11 +22,9 @@
 
 try {
     // Required to be defined in environment variables
-    $ADMIN_EMAIL = Env::get('ADMIN_EMAIL', 'na@example.org');
     $ADMIN_PASS = Env::requireEnv('ADMIN_PASS');
     $SECRET_SALT = Env::requireEnv('SECRET_SALT');
     $IDP_NAME = Env::requireEnv('IDP_NAME');
-    $IDP_DISPLAY_NAME = Env::get('IDP_DISPLAY_NAME', $IDP_NAME);
 } catch (EnvVarNotFoundException $e) {
 
     // Return error response code/message to HTTP request.
@@ -41,9 +39,10 @@
     exit($responseContent);
 }
 
-
 // Defaults provided if not defined in environment
+$IDP_DISPLAY_NAME = Env::get('IDP_DISPLAY_NAME', $IDP_NAME);
 $BASE_URL_PATH = Env::get('BASE_URL_PATH', '/');
+$ADMIN_EMAIL = Env::get('ADMIN_EMAIL', 'na@example.org');
 $ADMIN_NAME = Env::get('ADMIN_NAME', 'SAML Admin');
 $ADMIN_PROTECT_INDEX_PAGE = Env::get('ADMIN_PROTECT_INDEX_PAGE', true);
 $SHOW_SAML_ERRORS = Env::get('SHOW_SAML_ERRORS', false);
diff --git a/dockerbuild/config/config.php b/dockerbuild/config/config.php
index e046fb95..74da5399 100644
--- a/dockerbuild/config/config.php
+++ b/dockerbuild/config/config.php
@@ -22,11 +22,9 @@
 
 try {
     // Required to be defined in environment variables
-    $ADMIN_EMAIL = Env::get('ADMIN_EMAIL', 'na@example.org');
     $ADMIN_PASS = Env::requireEnv('ADMIN_PASS');
     $SECRET_SALT = Env::requireEnv('SECRET_SALT');
     $IDP_NAME = Env::requireEnv('IDP_NAME');
-    $IDP_DISPLAY_NAME = Env::get('IDP_DISPLAY_NAME', $IDP_NAME);
 } catch (EnvVarNotFoundException $e) {
 
     // Return error response code/message to HTTP request.
@@ -41,9 +39,10 @@
     exit($responseContent);
 }
 
-
 // Defaults provided if not defined in environment
+$IDP_DISPLAY_NAME = Env::get('IDP_DISPLAY_NAME', $IDP_NAME);
 $BASE_URL_PATH = Env::get('BASE_URL_PATH', '/');
+$ADMIN_EMAIL = Env::get('ADMIN_EMAIL', 'na@example.org');
 $ADMIN_NAME = Env::get('ADMIN_NAME', 'SAML Admin');
 $ADMIN_PROTECT_INDEX_PAGE = Env::get('ADMIN_PROTECT_INDEX_PAGE', true);
 $SHOW_SAML_ERRORS = Env::get('SHOW_SAML_ERRORS', false);