diff --git a/default.conf b/default.conf
index ea269a4..d82e8c3 100644
--- a/default.conf
+++ b/default.conf
@@ -21,7 +21,7 @@ server {
   }
   
   location /answer/ {
-    add_header Access-Control-Allow-Origin hbpn.link always;
+    add_header Access-Control-Allow-Origin $http_origin always;
     add_header Access-Control-Allow-Credentials true always;
     add_header Access-Control-Allow-Headers content-type,x-sessionkey always;
     add_header Access-Control-Expose-Headers x-sessionkey always;
@@ -30,7 +30,7 @@ server {
   }
   
   location /squizimages {
-    add_header Access-Control-Allow-Origin hbpn.link always;
+    add_header Access-Control-Allow-Origin $http_origin always;
     add_header Access-Control-Allow-Credentials true always;
     add_header Access-Control-Allow-Headers content-type always;
     add_header Access-Control-Allow-Methods GET;
@@ -41,6 +41,10 @@ server {
   }
 
   location / {
+    add_header Access-Control-Allow-Origin $http_origin always;
+    add_header Access-Control-Allow-Credentials true always;
+    add_header Access-Control-Allow-Headers content-type always;
+    add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PUT;
     proxy_pass http://respondent;
 	}