diff --git a/app/config/backdrop-clean/install.sh b/app/config/backdrop-clean/install.sh
index 8f123017..07726e02 100644
--- a/app/config/backdrop-clean/install.sh
+++ b/app/config/backdrop-clean/install.sh
@@ -20,7 +20,7 @@ backdrop_install
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${CMS_ROOT}/modules/civicrm"
 CIVI_SETTINGS="${CMS_ROOT}/civicrm.settings.php"
 CIVI_FILES="${CMS_ROOT}/files/civicrm"
diff --git a/app/config/backdrop-demo/install.sh b/app/config/backdrop-demo/install.sh
index a1923da4..4bcd7967 100644
--- a/app/config/backdrop-demo/install.sh
+++ b/app/config/backdrop-demo/install.sh
@@ -20,7 +20,7 @@ backdrop_install
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${CMS_ROOT}/modules/civicrm"
 CIVI_SETTINGS="${CMS_ROOT}/civicrm.settings.php"
 CIVI_FILES="${CMS_ROOT}/files/civicrm"
diff --git a/app/config/d8leg-clean/install.sh b/app/config/d8leg-clean/install.sh
index 2fc325b3..92c545a9 100644
--- a/app/config/d8leg-clean/install.sh
+++ b/app/config/d8leg-clean/install.sh
@@ -24,7 +24,7 @@ popd >> /dev/null
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${CMS_ROOT}/vendor/civicrm/civicrm-core"
 CIVI_UF="Drupal8"
 GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
diff --git a/app/config/d8prj-clean/install.sh b/app/config/d8prj-clean/install.sh
index c3714dd8..29d3726f 100644
--- a/app/config/d8prj-clean/install.sh
+++ b/app/config/d8prj-clean/install.sh
@@ -24,7 +24,7 @@ popd >> /dev/null
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
 CIVI_UF="Drupal8"
 GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
diff --git a/app/config/d8rec-clean/install.sh b/app/config/d8rec-clean/install.sh
index c3714dd8..29d3726f 100644
--- a/app/config/d8rec-clean/install.sh
+++ b/app/config/d8rec-clean/install.sh
@@ -24,7 +24,7 @@ popd >> /dev/null
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
 CIVI_UF="Drupal8"
 GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
diff --git a/app/config/drupal-case/install.sh b/app/config/drupal-case/install.sh
index 1c9c871d..44f7680c 100644
--- a/app/config/drupal-case/install.sh
+++ b/app/config/drupal-case/install.sh
@@ -21,7 +21,7 @@ drupal_install
 
 DRUPAL_SITE_DIR=$(_drupal_multisite_dir "$CMS_URL" "$SITE_ID")
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${CMS_ROOT}/sites/all/modules/civicrm"
 CIVI_SETTINGS="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/civicrm.settings.php"
 CIVI_FILES="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/files/civicrm"
diff --git a/app/config/drupal-clean/install.sh b/app/config/drupal-clean/install.sh
index 1ee98a80..8cf4ace4 100644
--- a/app/config/drupal-clean/install.sh
+++ b/app/config/drupal-clean/install.sh
@@ -21,7 +21,7 @@ drupal_install
 
 DRUPAL_SITE_DIR=$(_drupal_multisite_dir "$CMS_URL" "$SITE_ID")
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${CMS_ROOT}/sites/all/modules/civicrm"
 CIVI_SETTINGS="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/civicrm.settings.php"
 CIVI_FILES="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/files/civicrm"
diff --git a/app/config/drupal-demo/install.sh b/app/config/drupal-demo/install.sh
index 084516aa..6ecc2df2 100644
--- a/app/config/drupal-demo/install.sh
+++ b/app/config/drupal-demo/install.sh
@@ -21,7 +21,7 @@ drupal_install
 
 DRUPAL_SITE_DIR=$(_drupal_multisite_dir "$CMS_URL" "$SITE_ID")
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${CMS_ROOT}/sites/all/modules/civicrm"
 CIVI_SETTINGS="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/civicrm.settings.php"
 CIVI_FILES="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/files/civicrm"
diff --git a/app/config/drupal-sym1/install.sh b/app/config/drupal-sym1/install.sh
index d2993cd7..0e54edee 100644
--- a/app/config/drupal-sym1/install.sh
+++ b/app/config/drupal-sym1/install.sh
@@ -21,7 +21,7 @@ drupal_install
 
 DRUPAL_SITE_DIR=$(_drupal_multisite_dir "$CMS_URL" "$SITE_ID")
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${CMS_ROOT}/sites/all/modules/civicrm"
 CIVI_SETTINGS="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/civicrm.settings.php"
 CIVI_FILES="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/files/civicrm"
diff --git a/app/config/drupal-sym2/install.sh b/app/config/drupal-sym2/install.sh
index d2993cd7..0e54edee 100644
--- a/app/config/drupal-sym2/install.sh
+++ b/app/config/drupal-sym2/install.sh
@@ -21,7 +21,7 @@ drupal_install
 
 DRUPAL_SITE_DIR=$(_drupal_multisite_dir "$CMS_URL" "$SITE_ID")
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${CMS_ROOT}/sites/all/modules/civicrm"
 CIVI_SETTINGS="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/civicrm.settings.php"
 CIVI_FILES="${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}/files/civicrm"
diff --git a/app/config/drupal10-clean/install.sh b/app/config/drupal10-clean/install.sh
index 63c6f9b4..801ef00a 100644
--- a/app/config/drupal10-clean/install.sh
+++ b/app/config/drupal10-clean/install.sh
@@ -21,7 +21,7 @@ popd >> /dev/null
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
 CIVI_UF="Drupal8"
 GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
diff --git a/app/config/drupal10-demo/install.sh b/app/config/drupal10-demo/install.sh
index c049e144..55ece1c5 100644
--- a/app/config/drupal10-demo/install.sh
+++ b/app/config/drupal10-demo/install.sh
@@ -21,7 +21,7 @@ popd >> /dev/null
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
 CIVI_UF="Drupal8"
 GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
diff --git a/app/config/drupal10-dev/install.sh b/app/config/drupal10-dev/install.sh
index 63c6f9b4..801ef00a 100644
--- a/app/config/drupal10-dev/install.sh
+++ b/app/config/drupal10-dev/install.sh
@@ -21,7 +21,7 @@ popd >> /dev/null
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
 CIVI_UF="Drupal8"
 GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
diff --git a/app/config/drupal10-dod/install.sh b/app/config/drupal10-dod/install.sh
index b68cacd7..b81c09b9 100644
--- a/app/config/drupal10-dod/install.sh
+++ b/app/config/drupal10-dod/install.sh
@@ -21,7 +21,7 @@ popd >> /dev/null
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${CMS_ROOT}/vendor/civicrm/civicrm-core"
 CIVI_UF="Drupal8"
 GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
diff --git a/app/config/drupal11-dev/install.sh b/app/config/drupal11-dev/install.sh
index 63c6f9b4..801ef00a 100644
--- a/app/config/drupal11-dev/install.sh
+++ b/app/config/drupal11-dev/install.sh
@@ -21,7 +21,7 @@ popd >> /dev/null
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
 CIVI_UF="Drupal8"
 GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
diff --git a/app/config/drupal8-clean/install.sh b/app/config/drupal8-clean/install.sh
index 4a8319c3..11e2bbc5 100644
--- a/app/config/drupal8-clean/install.sh
+++ b/app/config/drupal8-clean/install.sh
@@ -22,7 +22,7 @@ popd >> /dev/null
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${CMS_ROOT}/vendor/civicrm/civicrm-core"
 CIVI_UF="Drupal8"
 GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
diff --git a/app/config/drupal8-demo/install.sh b/app/config/drupal8-demo/install.sh
index 9962375e..54fa14bd 100644
--- a/app/config/drupal8-demo/install.sh
+++ b/app/config/drupal8-demo/install.sh
@@ -21,7 +21,7 @@ popd >> /dev/null
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
 CIVI_UF="Drupal8"
 GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
diff --git a/app/config/drupal9-clean/install.sh b/app/config/drupal9-clean/install.sh
index f07747df..06434319 100644
--- a/app/config/drupal9-clean/install.sh
+++ b/app/config/drupal9-clean/install.sh
@@ -21,7 +21,7 @@ popd >> /dev/null
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
 CIVI_UF="Drupal8"
 GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
diff --git a/app/config/drupal9-demo/install.sh b/app/config/drupal9-demo/install.sh
index 0dd9f386..46f9fe9f 100644
--- a/app/config/drupal9-demo/install.sh
+++ b/app/config/drupal9-demo/install.sh
@@ -21,7 +21,7 @@ popd >> /dev/null
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
 CIVI_UF="Drupal8"
 GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
diff --git a/app/config/drupal9-dev/install.sh b/app/config/drupal9-dev/install.sh
index f07747df..06434319 100644
--- a/app/config/drupal9-dev/install.sh
+++ b/app/config/drupal9-dev/install.sh
@@ -21,7 +21,7 @@ popd >> /dev/null
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${WEB_ROOT}/vendor/civicrm/civicrm-core"
 CIVI_UF="Drupal8"
 GENCODE_CONFIG_TEMPLATE="${CMS_ROOT}/modules/contrib/civicrm/civicrm.config.php.drupal"
diff --git a/app/config/joomla-demo/install.sh b/app/config/joomla-demo/install.sh
index f77ecd9e..ac428e8a 100644
--- a/app/config/joomla-demo/install.sh
+++ b/app/config/joomla-demo/install.sh
@@ -20,7 +20,7 @@ popd >>/dev/null
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${CMS_ROOT}/administrator/components/com_civicrm/civicrm"
 CIVI_SETTINGS="${CMS_ROOT}/components/com_civicrm/civicrm.settings.php"
 CIVI_ADMSETTINGS="${CMS_ROOT}/administrator/components/com_civicrm/civicrm.settings.php"
diff --git a/app/config/standalone-clean/install.sh b/app/config/standalone-clean/install.sh
index 93d199e3..c0fbbe2a 100644
--- a/app/config/standalone-clean/install.sh
+++ b/app/config/standalone-clean/install.sh
@@ -12,7 +12,7 @@ amp_install
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${WEB_ROOT}/web/core"
 CIVI_UF="Standalone"
 CIVI_SETTINGS="${WEB_ROOT}/web/private/civicrm.settings.php"
diff --git a/app/config/standalone-composer/install.sh b/app/config/standalone-composer/install.sh
index 778d6223..a2d2def5 100644
--- a/app/config/standalone-composer/install.sh
+++ b/app/config/standalone-composer/install.sh
@@ -12,7 +12,7 @@ amp_install
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${CMS_ROOT}/vendor/civicrm/civicrm-core"
 CIVI_UF="Standalone"
 CIVI_SETTINGS="${CMS_ROOT}/private/civicrm.settings.php"
diff --git a/app/config/starterkit/install.sh b/app/config/starterkit/install.sh
index 6116f2c1..933a6be8 100644
--- a/app/config/starterkit/install.sh
+++ b/app/config/starterkit/install.sh
@@ -12,7 +12,7 @@ amp_install
 
 DRUPAL_SITE_DIR=$(_drupal_multisite_dir "$CMS_URL" "$SITE_ID")
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${WEB_ROOT}/profiles/civicrm_starterkit/modules/civicrm"
 CIVI_SETTINGS="${WEB_ROOT}/sites/${DRUPAL_SITE_DIR}/civicrm.settings.php"
 CIVI_FILES="${WEB_ROOT}/sites/${DRUPAL_SITE_DIR}/files/civicrm"
diff --git a/app/config/wmff/install.sh b/app/config/wmff/install.sh
index 0f2f0fa6..9af7b314 100644
--- a/app/config/wmff/install.sh
+++ b/app/config/wmff/install.sh
@@ -24,7 +24,7 @@ drupal_install
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${CMS_ROOT}/sites/all/modules/civicrm"
 CIVI_SETTINGS="${CMS_ROOT}/sites/default/civicrm.settings.php"
 CIVI_FILES="${CMS_ROOT}/sites/default/files/civicrm"
diff --git a/app/config/wp-case/install.sh b/app/config/wp-case/install.sh
index 0eda5574..bcc9351c 100644
--- a/app/config/wp-case/install.sh
+++ b/app/config/wp-case/install.sh
@@ -16,7 +16,7 @@ wp_install
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${WEB_ROOT}/wp-content/plugins/civicrm/civicrm"
 CIVI_SETTINGS="${WEB_ROOT}/wp-content/uploads/civicrm/civicrm.settings.php"
 CIVI_FILES="${WEB_ROOT}/wp-content/uploads/civicrm"
diff --git a/app/config/wp-clean/install.sh b/app/config/wp-clean/install.sh
index df154bdd..530559e9 100644
--- a/app/config/wp-clean/install.sh
+++ b/app/config/wp-clean/install.sh
@@ -20,7 +20,7 @@ wp_install
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${CMS_ROOT}/wp-content/plugins/civicrm/civicrm"
 
 if [[ "$CIVI_VERSION" =~ ^4.[0123456](\.([0-9]|alpha|beta)+)?$ ]] ; then
diff --git a/app/config/wp-demo/install.sh b/app/config/wp-demo/install.sh
index 0d7ec18d..eafd4459 100644
--- a/app/config/wp-demo/install.sh
+++ b/app/config/wp-demo/install.sh
@@ -20,7 +20,7 @@ wp_install
 ## Setup CiviCRM (config files, database tables)
 
 CIVI_DOMAIN_NAME="Demonstrators Anonymous"
-CIVI_DOMAIN_EMAIL="\"Demonstrators Anonymous\" <info@example.org>"
+CIVI_DOMAIN_EMAIL="info@example.org"
 CIVI_CORE="${CMS_ROOT}/wp-content/plugins/civicrm/civicrm"
 
 if [[ "$CIVI_VERSION" =~ ^4.[0123456](\.([0-9]|alpha|beta)+)?$ ]] ; then
diff --git a/src/civibuild.lib.sh b/src/civibuild.lib.sh
index 16e66936..46744dc7 100644
--- a/src/civibuild.lib.sh
+++ b/src/civibuild.lib.sh
@@ -771,17 +771,27 @@ function civicrm_install_cv() {
 ###############################################################################
 ## Update the CiviCRM domain's name+email
 function civicrm_update_domain() {
-  cvutil_assertvars civicrm_install CIVI_DOMAIN_NAME CIVI_DOMAIN_EMAIL
-  cvutil_php_nodbg amp sql -Ncivi --root="$CMS_ROOT" <<EOSQL
-    UPDATE civicrm_domain SET name = '$CIVI_DOMAIN_NAME';
-    SELECT @option_group_id := id
-      FROM civicrm_option_group n
-      WHERE name = 'from_email_address';
-    UPDATE civicrm_option_value
-      SET label = '$CIVI_DOMAIN_EMAIL'
-      WHERE option_group_id = @option_group_id
-      AND value = '1';
+  cvutil_assertvars civicrm_install CIVI_DOMAIN_NAME CIVI_DOMAIN_EMAIL CIVI_VERSION
+  ## In 6.0 the from_email_address option group was moved to the civicrm_domain_email_address table
+  if civicrm_check_ver '<' 6.0.alpha1 ; then
+    cvutil_php_nodbg amp sql -Ncivi --root="$CMS_ROOT" <<EOSQL
+      UPDATE civicrm_domain SET name = '$CIVI_DOMAIN_NAME';
+      SELECT @option_group_id := id
+        FROM civicrm_option_group n
+        WHERE name = 'from_email_address';
+      UPDATE civicrm_option_value
+        SET label = '"$CIVI_DOMAIN_NAME" <$CIVI_DOMAIN_EMAIL>'
+        WHERE option_group_id = @option_group_id
+        AND value = '1';
 EOSQL
+  else
+    cvutil_php_nodbg amp sql -Ncivi --root="$CMS_ROOT" <<EOSQL
+      UPDATE civicrm_domain SET name = '$CIVI_DOMAIN_NAME';
+      UPDATE civicrm_domain_email_address
+        SET email = '$CIVI_DOMAIN_EMAIL', display_name = '$CIVI_DOMAIN_NAME'
+        WHERE is_default = 1;
+EOSQL
+  fi
 }
 
 ###############################################################################