diff --git a/util/Setup/Templates/NginxConfig.hbs b/util/Setup/Templates/NginxConfig.hbs
index e8cc216db..e925fb337 100644
--- a/util/Setup/Templates/NginxConfig.hbs
+++ b/util/Setup/Templates/NginxConfig.hbs
@@ -100,10 +100,6 @@ server {
     proxy_pass http://api:5000/;
   }
 
-  location /sso/ {
-    proxy_pass http://sso:5000/;
-  }
-
   location /icons/ {
     proxy_pass http://icons:5000/;
   }
@@ -122,6 +118,15 @@ server {
     proxy_pass http://events:5000/;
   }
 
+  location /sso {
+    proxy_pass http://sso:5000;
+{{#if Ssl}}
+    include /etc/nginx/security-headers-ssl.conf;
+{{/if}}
+    include /etc/nginx/security-headers.conf;
+    add_header X-Frame-Options SAMEORIGIN;
+  }
+
   location /identity {
     proxy_pass http://identity:5000;
 {{#if Ssl}}