diff --git a/jupyterhub/user.py b/jupyterhub/user.py
index 2e91c466..19fb5173 100644
--- a/jupyterhub/user.py
+++ b/jupyterhub/user.py
@@ -166,9 +166,9 @@ class User(HasTraits):
     @property
     def proxy_path(self):
         if self.settings.get('subdomain_host'):
-            return url_path_join('/' + self.domain, self.base_url)
+            return url_path_join('/' + self.domain, self.server_base_url)
         else:
-            return self.base_url
+            return self.server_base_url
 
     @property
     def domain(self):
@@ -235,6 +235,8 @@ class User(HasTraits):
         api_token = self.new_api_token()
         db.commit()
 
+        self.server_base_url = base_url
+
         spawner = self.spawner
         # Passing server_name and base_url to the spawner
         spawner.server_base_url = base_url