diff --git a/global/overlay/etc/puppet/modules/soc/templates/sso/apache-site.conf.erb b/global/overlay/etc/puppet/modules/soc/templates/sso/apache-site.conf.erb
index df36f70..6e51003 100644
--- a/global/overlay/etc/puppet/modules/soc/templates/sso/apache-site.conf.erb
+++ b/global/overlay/etc/puppet/modules/soc/templates/sso/apache-site.conf.erb
@@ -40,8 +40,10 @@
 
         <%- if @x_remote_user -%>
         RequestHeader set X-Remote-User %{REMOTE_USER}s
+        <%- elsif @remote_user -%>
+        RequestHeader set Remote-User %{REMOTE_USER}s
         <%- elsif @single_user -%>
-        RequestHeader set X-Remote-User cnaas-user
+        RequestHeader set X-Remote-User soc-user
         <%- else -%>
         ShibUseHeaders On
         <%- end -%>