diff --git a/conf/config.json b/conf/config.json
index ddf9fea..4c80dd2 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -21,7 +21,7 @@
   "panel": {
     "email": {
       "provider": "smtp",
-      "from": "pufferpanel@__DOMAIN__",
+      "from": "pufferpanel@__MAIN_DOMAIN__",
       "host": "localhost",
       "username": "__APP__",
       "password": "__MAIL_PWD__",
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 944a65e..0f1a117 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,6 +4,8 @@
 # COMMON VARIABLES
 #=================================================
 
+main_domain=$(cat /etc/yunohost/current_host)
+
 #=================================================
 # PERSONAL HELPERS
 #=================================================