diff --git a/modules/installed/lib/auth_page.py b/modules/installed/lib/auth_page.py
index cab7890bc..3f3574c6a 100644
--- a/modules/installed/lib/auth_page.py
+++ b/modules/installed/lib/auth_page.py
@@ -36,7 +36,7 @@ class AuthController(PagePlugin):
         else:
             cherrypy.session[cfg.session_key] = cherrypy.request.login = username
             self.on_login(username)
-            raise cherrypy.HTTPRedirect(from_page or "/")
+            raise cherrypy.HTTPRedirect(from_page or (cfg.server_dir + "/"))
     
     @cherrypy.expose
     def logout(self, from_page="/"):
@@ -46,4 +46,4 @@ class AuthController(PagePlugin):
         if username:
             cherrypy.request.login = None
             self.on_logout(username)
-        raise cherrypy.HTTPRedirect(from_page or "/")
+        raise cherrypy.HTTPRedirect(from_page or (cfg.server_dir + "/"))
diff --git a/modules/installed/sharing/sharing.py b/modules/installed/sharing/sharing.py
index 7617c577a..3a0de623b 100644
--- a/modules/installed/sharing/sharing.py
+++ b/modules/installed/sharing/sharing.py
@@ -19,7 +19,7 @@ class Sharing(PagePlugin):
         reflect that we've moved down into the submenu hierarchy.
         Otherwise, it's hard to know which menu portion to make active
         or expand or contract."""
-        raise cherrypy.HTTPRedirect('/sharing/files')
+        raise cherrypy.HTTPRedirect(cfg.server_dir + '/sharing/files')
 
     @cherrypy.expose
     @require()