diff --git a/src/freedombone-config b/src/freedombone-config
index 0523077e..dbd1a4c6 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -216,6 +216,8 @@ function choose_default_domain_name {
                     if [ ! $VALID_CODE ]; then
                         DEFAULT_DOMAIN_NAME=
                         EMAIL_DOMAIN_CODE=
+                    else
+                        write_config_param "EMAIL_DOMAIN_CODE" "$EMAIL_DOMAIN_CODE"
                     fi
                 fi
                 if [ $XMPP_DOMAIN_CODE ]; then
@@ -223,6 +225,8 @@ function choose_default_domain_name {
                     if [ ! $VALID_CODE ]; then
                         DEFAULT_DOMAIN_NAME=
                         XMPP_DOMAIN_CODE=
+                    else
+                        write_config_param "XMPP_DOMAIN_CODE" "$XMPP_DOMAIN_CODE"
                     fi
                 fi
             else