diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index aac97c984893f9c48ba5197389c6991a465fff2d..d3b4f6807faf04a0c91d3dda69b3fcaef404610e 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -1649,6 +1649,8 @@ function install_email {
     read_config_param MY_EMAIL_ADDRESS
     read_config_param DH_KEYLENGTH
 
+    MY_EMAIL_ADDRESS=${MY_USERNAME}@${DEFAULT_DOMAIN_NAME}
+
     install_email_basic
     #install_email_with_tor