diff --git a/.gitignore b/.gitignore
index 17e79bb7..92491133 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 # generated files
 /static/js/profile_all.js
 /static/js/locale.js
+/static/js/Markup.js
 /static/widgets/power.js
 /static/widgets/power/demo.html
 /static/widgets/searchbox.js
diff --git a/includes/ajaxHandler/admin.class.php b/includes/ajaxHandler/admin.class.php
index 54ebbedd..62aa1d20 100644
--- a/includes/ajaxHandler/admin.class.php
+++ b/includes/ajaxHandler/admin.class.php
@@ -512,6 +512,9 @@ class AjaxAdmin extends AjaxHandler
             case 'static_host':
                 $buildList = 'searchplugin,power,searchboxBody,searchboxScript';
                 break;
+            case 'contact_email':
+                $buildList = 'markup';
+                break;
             case 'locales':
                 $buildList = 'locales';
                 $msg .= ' * remember to rebuild all static files for the language you just added.<br />';
diff --git a/setup/tools/clisetup/siteconfig.func.php b/setup/tools/clisetup/siteconfig.func.php
index 12ed36cd..e1fa3239 100644
--- a/setup/tools/clisetup/siteconfig.func.php
+++ b/setup/tools/clisetup/siteconfig.func.php
@@ -41,6 +41,9 @@ function siteconfig() : void
             case 'static_host':
                 array_push($updScripts, 'searchplugin', 'power', 'searchboxBody', 'searchboxScript');
                 break;
+            case 'contact_email':
+                array_push($updScripts, 'markup');
+                break;
             case 'locales':
                 array_push($updScripts, 'locales');
                 CLI::write(' * remember to rebuild all static files for the language you just added.', CLI::LOG_INFO);
@@ -329,7 +332,8 @@ function siteconfig() : void
                                     {
                                         CLI::write();
 
-                                        if (!$validate($use ? $use['idx'] : ''))
+                                        $inp = $use['idx'] ?? '';
+                                        if (!$validate($inp))
                                         {
                                             CLI::write("value not in range", CLI::LOG_ERROR);
                                             sleep(1);
@@ -338,10 +342,10 @@ function siteconfig() : void
                                         else
                                         {
                                             $oldVal = DB::Aowow()->selectCell('SELECT `value` FROM ?_config WHERE `key` = ?', $key);
-                                            DB::Aowow()->query('UPDATE ?_config SET `value` = ? WHERE `key` = ?', $use['idx'], $key);
+                                            DB::Aowow()->query('UPDATE ?_config SET `value` = ? WHERE `key` = ?', $inp, $key);
 
                                             // postChange returned false => reset value
-                                            if (!$onChange($key, $use['idx']))
+                                            if (!$onChange($key, $inp))
                                             {
                                                 DB::Aowow()->query('UPDATE ?_config SET `value` = ? WHERE `key` = ?', $oldVal, $key);
                                                 sleep(1);
diff --git a/setup/tools/fileGen.class.php b/setup/tools/fileGen.class.php
index 748342dd..33927f9d 100644
--- a/setup/tools/fileGen.class.php
+++ b/setup/tools/fileGen.class.php
@@ -26,6 +26,7 @@ class FileGen
         'searchboxBody'   => ['searchbox.html', 'static/widgets/searchbox/',      []],
         'realmMenu'       => ['profile_all.js', 'static/js/',                     ['realmlist']],
         'locales'         => ['locale.js',      'static/js/',                     []],
+        'markup'          => ['Markup.js',      'static/js/',                     []],
         'itemScaling'     => ['item-scaling',   'datasets/',                      []]
     );
     public static $datasets   = array(                      // name => [AowowDeps, TCDeps, info]
@@ -59,10 +60,11 @@ class FileGen
     );
 
     private static $txtConstants = array(
-        'CFG_NAME'       => '',
-        'CFG_NAME_SHORT' => '',
-        'HOST_URL'       => '',
-        'STATIC_URL'     => ''
+        'CFG_NAME'          => '',
+        'CFG_NAME_SHORT'    => '',
+        'CFG_CONTACT_EMAIL' => '',
+        'HOST_URL'          => '',
+        'STATIC_URL'        => ''
     );
 
     public static function init(int $mode = self::MODE_NORMAL, array $updScripts = []) : bool
diff --git a/static/js/Markup.js b/setup/tools/filegen/templates/Markup.js.in
similarity index 99%
rename from static/js/Markup.js
rename to setup/tools/filegen/templates/Markup.js.in
index c3c2f052..28470eaf 100644
--- a/static/js/Markup.js
+++ b/setup/tools/filegen/templates/Markup.js.in
@@ -28,13 +28,13 @@ MarkupSourceMap[MARKUP_SOURCE_PTR]  = 'ptr';
 MarkupSourceMap[MARKUP_SOURCE_BETA] = 'beta';
 
 var MarkupDomainRegexMap = {
-    betaPtrLang: /^(beta|legion|wod|mop|ptr|www|ko|fr|de|cn|es|ru|pt|it)$/,
-    lang: /^(www|fr|de|cn|es|ru)$/                          // Aowowo - /^(www|ko|fr|de|cn|es|ru|pt|it)$/
+    betaPtrLang: /^(www|fr|de|cn|es|ru)$/,                  // Aowow - /^(beta|legion|wod|mop|ptr|www|ko|fr|de|cn|es|ru|pt|it)$/
+    lang: /^(www|fr|de|cn|es|ru)$/                          // Aowow - /^(www|ko|fr|de|cn|es|ru|pt|it)$/
 };
 
 var Markup = {
     MODE_COMMENT:    MARKUP_MODE_COMMENT,
-    MODE_REPLY:         MARKUP_MODE_REPLY,
+    MODE_REPLY:      MARKUP_MODE_REPLY,
     MODE_ARTICLE:    MARKUP_MODE_ARTICLE,
     MODE_QUICKFACTS: MARKUP_MODE_QUICKFACTS,
     MODE_SIGNATURE:  MARKUP_MODE_SIGNATURE,
@@ -70,15 +70,15 @@ var Markup = {
     nameCol: 'name_enus',
     domainToLocale: {
         'www': 'enus',
-        'ptr': 'ptr',
-        'beta': 'beta',
-        'mop': 'beta',
+     // 'ptr': 'ptr',
+     // 'beta': 'beta',
+     // 'mop': 'beta',
         'fr': 'frfr',
         'de': 'dede',
         'cn': 'zhcn',
         'es': 'eses',
         'ru': 'ruru',
-        'pt': 'ptbr'
+     // 'pt': 'ptbr'
     },
     maps: [],
     firstTags: {},
@@ -775,7 +775,7 @@ var Markup = {
             },
             toHtml: function(attr)
             {
-                return '<b><span class="icontiny" style="background-image: url(' + g_staticUrl + '/images/icons/email.gif)"><a href="' + (attr.mailto ? 'mailto:feedback@wowhead.com' : 'javascript:;" onclick="ContactTool.show();') + '">feedback@wowhead.com</a></span></b>';
+                return '<b><span class="icontiny" style="background-image: url(' + g_staticUrl + '/images/icons/email.gif)"><a href="' + (attr.mailto ? 'mailto:CFG_CONTACT_EMAIL' : 'javascript:;" onclick="ContactTool.show();') + '">CFG_CONTACT_EMAIL</a></span></b>';
             }
         },
         forumrules:
diff --git a/setup/updates/1647813287_01.sql b/setup/updates/1647813287_01.sql
new file mode 100644
index 00000000..806c663d
--- /dev/null
+++ b/setup/updates/1647813287_01.sql
@@ -0,0 +1 @@
+UPDATE `aowow_dbversion` SET `build` = CONCAT(IFNULL(`build`, ''), ' markup');