diff --git a/src/public/autoconfig.php b/src/public/autoconfig.php
index dacf2aa..d727289 100644
--- a/src/public/autoconfig.php
+++ b/src/public/autoconfig.php
@@ -8,6 +8,9 @@ if ($data["path"]) {
   if ($email[0] == "emailaddress") {
     $email = $email[1];
     $email_provided = true;
+    if (Core::$Config["LogonDomain"]) {
+      $email = str_ireplace(Core::$Config["Domain"],Core::$Config["LogonDomain"],$email);
+    }
   }
 }
 ?>
diff --git a/src/sample-config/config.sample.ini b/src/sample-config/config.sample.ini
index 8653f68..b89f781 100644
--- a/src/sample-config/config.sample.ini
+++ b/src/sample-config/config.sample.ini
@@ -3,6 +3,7 @@
 
 ; Set the base domain for use with this service
 Domain = example.com
+LogonDomain = example.local
 
 ; Admin User configuration
 ; not in use yet