diff --git a/conf/nginx.conf b/conf/nginx.conf
index 7942534..0a9277e 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -14,7 +14,7 @@ location / {
 
   # If we're on the "account_domain, redirect to the main domain"
   if ($is_account_domain = 1) {
-    rewrite ^ https://__PATH__$request_uri? permanent;
+    rewrite ^ https://__MAIN_DOMAIN__$request_uri? permanent;
   }
 
   if ($is_account_domain = 0) {
@@ -30,11 +30,11 @@ location / {
 # redirect the account_domain .well-known to the main domain one
 location = /.well-known/webfinger { 
   if ($is_account_domain = 1) {
-    return 301 __PATH__/.well-known/webfinger; 
+    rewrite ^.*$ https://__MAIN_DOMAIN__/.well-known/webfinger permanent;
   }
 }
 location = /.well-known/nodeinfo  {
   if ($is_account_domain = 1) {
-    return 301 __PATH__/.well-known/nodeinfo;
+    rewrite ^.*$ https://__MAIN_DOMAIN__/.well-known/nodeinfo permanent;
   }
 }
diff --git a/scripts/install b/scripts/install
index 807cd65..b4918c3 100755
--- a/scripts/install
+++ b/scripts/install
@@ -210,6 +210,8 @@ chown -R "$app:www-data" "$final_path"
 #=================================================
 ynh_script_progression --message="Configuring NGINX web server..." --weight=1
 
+main_domain="$domain"
+
 # Create a dedicated NGINX config for the main domain
 ynh_add_nginx_config
 
@@ -217,13 +219,12 @@ ynh_add_nginx_config
 if [ "$domain" != "$account_domain" ] && [ -n "$account_domain" ]; then 
 
 	# switching domain name for tricking ynh_add_nginx_config (who supports only the 'domain' variable)
-	domain_backup="$domain"
 	domain="$account_domain"
 
 	ynh_add_nginx_config
 
 	# undo the trick
-	domain="$domain_backup"
+	domain="$main_domain"
 fi
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 97e2617..70392a3 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -82,6 +82,8 @@ ynh_secure_remove --file="$datadir"
 #=================================================
 ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
 
+main_domain="$domain"
+
 # Remove the dedicated NGINX config of the main domain
 ynh_remove_nginx_config
 
@@ -89,13 +91,12 @@ ynh_remove_nginx_config
 if [ "$domain" != "$account_domain" ] && [ -n "$account_domain" ]; then 
 
 	# switching domain name for tricking ynh_add_nginx_config (who supports only the 'domain' variable)
-	domain_backup="$domain"
 	domain="$account_domain"
 
 	ynh_remove_nginx_config
 
 	# undo the trick
-	domain="$domain_backup"
+	domain="$main_domain"
 fi
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 8241d1a..714d694 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -278,6 +278,8 @@ chown -R "$app:www-data" "$final_path"
 #=================================================
 ynh_script_progression --message="Upgrading NGINX web server configuration..."
 
+main_domain="$domain"
+
 # Create a dedicated NGINX config for the main domain
 ynh_add_nginx_config
 
@@ -285,13 +287,12 @@ ynh_add_nginx_config
 if [ "$domain" != "$account_domain" ] && [ -n "$account_domain" ]; then 
 
 	# switching domain name for tricking ynh_add_nginx_config (who supports only the 'domain' variable)
-	domain_backup="$domain"
 	domain="$account_domain"
 
 	ynh_add_nginx_config
 
 	# undo the trick
-	domain="$domain_backup"
+	domain="$main_domain"
 fi
 
 #=================================================