diff --git a/conf/nginx.conf b/conf/nginx.conf
index a6db09c..596bb72 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,3 +1,9 @@
+# Verifying of it's the "account_domain"
+set $is_account_domain 0;
+if ($host = __ACCOUNT_DOMAIN__) {
+  set $is_account_domain 1;
+}
+
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
 
@@ -7,6 +13,11 @@ location __PATH__/ {
   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   proxy_set_header Host $host;
 
+  # If we're on the "account_domain, redirect to the main domain"
+  if ($is_account_domain = 1) {
+    rewrite ^ https://__PATH__$request_uri? permanent;
+  }
+
   proxy_pass http://localhost:__PORT__;
 
   client_max_body_size __CLIENT_MAX_BODY_SIZE__;
@@ -14,3 +25,13 @@ location __PATH__/ {
   # Include SSOWAT user panel.
   include conf.d/yunohost_panel.conf.inc;
 }
+
+location ^~ /.well-known {
+
+  if ($is_account_domain = 1) {
+    location = /.well-known/webfinger { return 301 __PATH__/.well-known/webfinger; }
+    location = /.well-known/nodeinfo  { return 301 __PATH__/.well-known/nodeinfo; }
+  }
+
+  try_files $uri $uri/ =404;
+}