diff --git a/lib/galaxy/web/framework/middleware/remoteuser.py b/lib/galaxy/web/framework/middleware/remoteuser.py
index a6be0e3bb07..baeaafc83fe 100644
--- a/lib/galaxy/web/framework/middleware/remoteuser.py
+++ b/lib/galaxy/web/framework/middleware/remoteuser.py
@@ -62,6 +62,7 @@ class RemoteUser( object ):
                 # in the event of a lookup failure, deny access
                 host = None
             if host in UCSC_SERVERS:
+                environ[ 'HTTP_REMOTE_USER' ] = 'ucsc_browser_display@example.org'
                 return self.app( environ, start_response )
         # Apache sets REMOTE_USER to the string '(null)' when using the
         # Rewrite* method for passing REMOTE_USER and a user is
diff --git a/lib/galaxy/web/framework/middleware/xforwardedhost.py b/lib/galaxy/web/framework/middleware/xforwardedhost.py
index 0c5ff1feeb2..ce149ed3b6a 100644
--- a/lib/galaxy/web/framework/middleware/xforwardedhost.py
+++ b/lib/galaxy/web/framework/middleware/xforwardedhost.py
@@ -14,4 +14,8 @@ class XForwardedHostMiddleware( object ):
         if x_forwarded_for:
             environ[ 'ORGINAL_REMOTE_ADDR' ] = environ[ 'REMOTE_ADDR' ]
             environ[ 'REMOTE_ADDR' ] = x_forwarded_for
-        return self.app( environ, start_response )
\ No newline at end of file
+        x_url_scheme = environ.get( 'HTTP_X_URL_SCHEME', None )
+        if x_url_scheme:
+            environ[ 'original_wsgi.url_scheme' ] = environ[ 'wsgi.url_scheme' ]
+            environ[ 'wsgi.url_scheme' ] = x_url_scheme
+        return self.app( environ, start_response )