diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index d3b4f680..9c4ba6ab 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -1649,7 +1649,9 @@ function install_email {
     read_config_param MY_EMAIL_ADDRESS
     read_config_param DH_KEYLENGTH
 
-    MY_EMAIL_ADDRESS=${MY_USERNAME}@${DEFAULT_DOMAIN_NAME}
+    if [ ${#MY_EMAIL_ADDRESS} -lt 3 ]; then
+        MY_EMAIL_ADDRESS=${MY_USERNAME}@${DEFAULT_DOMAIN_NAME}
+    fi
 
     install_email_basic
     #install_email_with_tor