diff --git a/services/proxy/default-ssl.conf b/services/proxy/default-ssl.conf
index a52f5b0133de50e5fb87f945afb0b6acf2d33b3a..1124d7dc6ce621cce28da113d36f31fb0709ed77 100644
--- a/services/proxy/default-ssl.conf
+++ b/services/proxy/default-ssl.conf
@@ -133,7 +133,9 @@
                 downgrade-1.0 force-response-1.0
         # MSIE 7 and newer should be able to use keepalive
         BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-        
+
+    # Required for the Open ID connect redirects to work properly
+    RequestHeader set X-Forwarded-Proto 'https' env=HTTPS        
 
     </VirtualHost>
 </IfModule>
diff --git a/services/webapp/code/rosetta/settings.py b/services/webapp/code/rosetta/settings.py
index 8d895716d6694a6ea8b81b3f1ea579225a42ee12..6b49a22702d8f98cbf6008b61d16f422a163a52c 100644
--- a/services/webapp/code/rosetta/settings.py
+++ b/services/webapp/code/rosetta/settings.py
@@ -263,8 +263,11 @@ if OIDC_RP_CLIENT_ID:
     LOGIN_REDIRECT_URL = '/'
     LOGOUT_REDIRECT_URL = '/'
     LOGIN_REDIRECT_URL_FAILURE = '/'
-    
+    #OIDC_AUTHENTICATION_CALLBACK_URL = 'rosetta.local/oidc/callback/'
 
+    # Required for the Open ID connect redirects to work properly
+    USE_X_FORWARDED_HOST = True
+    SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')