diff --git a/data/assets/nextcloud/nextcloud.conf b/data/assets/nextcloud/nextcloud.conf
index 243cc406..4f4928f5 100644
--- a/data/assets/nextcloud/nextcloud.conf
+++ b/data/assets/nextcloud/nextcloud.conf
@@ -18,14 +18,15 @@ server {
   ssl_session_cache shared:SSL:50m;
   ssl_session_timeout 1d;
   ssl_session_tickets off;
-  add_header Strict-Transport-Security "max-age=15768000; includeSubDomains";
-  add_header X-Content-Type-Options nosniff;
-  add_header X-XSS-Protection "1; mode=block";
-  add_header X-Robots-Tag none;
-  add_header X-Download-Options noopen;
-  add_header X-Permitted-Cross-Domain-Policies none;
-  #add_header X-Frame-Options "SAMEORIGIN";
-  add_header Referrer-Policy "no-referrer";
+  add_header Referrer-Policy "no-referrer" always;
+  add_header X-Content-Type-Options "nosniff" always;
+  add_header X-Download-Options "noopen" always;
+  add_header X-Frame-Options "SAMEORIGIN" always;
+  add_header X-Permitted-Cross-Domain-Policies "none" always;
+  add_header X-Robots-Tag "none" always;
+  add_header X-XSS-Protection "1; mode=block" always;
+
+  fastcgi_hide_header X-Powered-By;
 
   server_name NC_SUBD;
 
@@ -50,6 +51,8 @@ server {
     root /web;
   }
 
+  fastcgi_buffers 64 4K;
+
   gzip on;
   gzip_vary on;
   gzip_comp_level 4;
@@ -67,21 +70,24 @@ server {
     rewrite ^ /index.php$uri;
   }
 
-  location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ {
+  location ~ ^\/(?:build|tests|config|lib|3rdparty|templates|data)\/ {
+    deny all;
+  }
+  location ~ ^\/(?:\.|autotest|occ|issue|indie|db_|console) {
     deny all;
   }
 
-  location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) {
-    deny all;
-  }
-
-  location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|oc[ms]-provider/.+)\.php(?:$|/) {
-    fastcgi_split_path_info ^(.+\.php)(/.*)$;
+  location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+)\.php(?:$|\/) {
+    fastcgi_split_path_info ^(.+?\.php)(\/.*|)$;
+    set $path_info $fastcgi_path_info;
+    try_files $fastcgi_script_name =404;
     include fastcgi_params;
     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-    fastcgi_param PATH_INFO $fastcgi_path_info;
-    #Avoid sending the security headers twice
+    fastcgi_param PATH_INFO $path_info;
+    fastcgi_param HTTPS on;
+    # Avoid sending the security headers twice
     fastcgi_param modHeadersAvailable true;
+    # Enable pretty urls
     fastcgi_param front_controller_active true;
     fastcgi_pass phpfpm:9002;
     fastcgi_intercept_errors on;
@@ -90,24 +96,26 @@ server {
     fastcgi_read_timeout 1200;
   }
 
-  location ~ ^/(?:updater|oc[ms]-provider)(?:$|/) {
+  location ~ ^\/(?:updater|oc[ms]-provider)(?:$|\/) {
     try_files $uri/ =404;
     index index.php;
   }
 
-  location ~ \.(?:css|js|woff2?|svg|gif)$ {
-    try_files $uri /index.php$uri$is_args$args;
+  location ~ \.(?:css|js|woff2?|svg|gif|map)$ {
+    try_files $uri /index.php$request_uri;
     add_header Cache-Control "public, max-age=15778463";
-    add_header X-Content-Type-Options nosniff;
-    add_header X-XSS-Protection "1; mode=block";
-    add_header X-Robots-Tag none;
-    add_header X-Download-Options noopen;
-    add_header X-Permitted-Cross-Domain-Policies none;
+    add_header Referrer-Policy "no-referrer" always;
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header X-Download-Options "noopen" always;
+    add_header X-Frame-Options "SAMEORIGIN" always;
+    add_header X-Permitted-Cross-Domain-Policies "none" always;
+    add_header X-Robots-Tag "none" always;
+    add_header X-XSS-Protection "1; mode=block" always;
     access_log off;
   }
 
-  location ~ \.(?:png|html|ttf|ico|jpg|jpeg)$ {
-    try_files $uri /index.php$uri$is_args$args;
+  location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ {
+    try_files $uri /index.php$request_uri;
     access_log off;
   }
 }
diff --git a/data/web/user.php b/data/web/user.php
index 3c49bbe1..c3b503de 100644
--- a/data/web/user.php
+++ b/data/web/user.php
@@ -394,12 +394,12 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
 				<div class="col-sm-10">
 				</div>
         <div class="btn-group" data-acl="<?=$_SESSION['acl']['spam_policy'];?>">
-          <a data-acl="<?=$_SESSION['acl']['spam_score'];?>" type="button" class="btn btn-sm btn-success" data-action="edit_selected"
+          <a type="button" class="btn btn-sm btn-success" data-action="edit_selected"
             data-item="<?= htmlentities($username); ?>"
             data-id="spam_score"
             data-api-url='edit/spam-score'
             data-api-attr='{}'><?=$lang['user']['save_changes'];?></a>
-          <a data-acl="<?=$_SESSION['acl']['spam_score'];?>" type="button" class="btn btn-sm btn-default" data-action="edit_selected"
+          <a type="button" class="btn btn-sm btn-default" data-action="edit_selected"
             data-item="<?= htmlentities($username); ?>"
             data-id="spam_score_reset"
             data-api-url='edit/spam-score'