diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 81a759ac21f9ca2fe881a29399660c7363ca5b70..3dcbb64339d1777e719d18fc0a9be6fb7697341a 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -1242,6 +1242,14 @@ function install_web_admin_webmail {
     chmod 0730 data temp
 
     read_config_param DEFAULT_LANGUAGE
+    read_config_param ONION_ONLY
+
+    if [[ "$ONION_ONLY" == 'no' ]]; then
+        read_config_param DEFAULT_DOMAIN_NAME
+        email_domain=$DEFAULT_DOMAIN_NAME
+    else
+        email_domain=$(cat /var/lib/tor/hidden_service_email/hostname)
+    fi
 
     { echo '<?php';
       echo '';
@@ -1272,7 +1280,7 @@ function install_web_admin_webmail {
       echo "\$default_charset       = 'iso-8859-1';";
       echo "\$lossy_encoding        = false;";
       echo '';
-      echo "\$domain                 = '$(cat /var/lib/tor/hidden_service_email/hostname)';";
+      echo "\$domain                 = '$email_domain';";
       echo "\$imapServerAddress      = 'localhost';";
       echo "\$imapPort               = 143;";
       echo "\$useSendmail            = false;";