diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain
index fb24bdd1..5995692b 100755
--- a/bin/v-add-web-domain
+++ b/bin/v-add-web-domain
@@ -118,13 +118,14 @@ if [ ! -z "$WEB_BACKEND" ]; then
     fi
     $BIN/v-add-web-domain-backend "$user" "$domain" $BACKEND_TEMPLATE
     check_result $? "Backend error" >/dev/null
-    prepare_web_backend
 fi
 
-# Preparing domain aliases
+# Preparing domain variables
+ALIAS="$aliases"
 if [ "$aliases" != 'none' ]; then
-    prepare_web_aliases "www.$domain,$aliases,$(get_ip_alias $domain)"
+    ALIAS="www.$domain,$aliases,$(get_ip_alias $domain)"
 fi
+prepare_web_domain_values
 
 # Adding web server config
 add_web_config "$WEB_SYSTEM" "$WEB_TEMPLATE.tpl"
diff --git a/func/domain.sh b/func/domain.sh
index f345bcf7..a163d259 100644
--- a/func/domain.sh
+++ b/func/domain.sh
@@ -200,8 +200,8 @@ add_web_config() {
             -e "s|%user%|$user|g" \
             -e "s|%group%|$user|g" \
             -e "s|%home%|$HOMEDIR|g" \
-            -e "s|%docroot%|$HOMEDIR/$user/web/$domain/public_html|g" \
-            -e "s|%sdocroot%|$HOMEDIR/$user/web/$domain/public_html|g" \
+            -e "s|%docroot%|$docroot|g" \
+            -e "s|%sdocroot%|$sdocroot|g" \
             -e "s|%ssl_crt%|$ssl_crt|g" \
             -e "s|%ssl_key%|$ssl_key|g" \
             -e "s|%ssl_pem%|$ssl_pem|g" \