diff --git a/IPython/frontend/html/notebook/base/handlers.py b/IPython/frontend/html/notebook/base/handlers.py
index e317ebdb0..5a4dcd398 100644
--- a/IPython/frontend/html/notebook/base/handlers.py
+++ b/IPython/frontend/html/notebook/base/handlers.py
@@ -147,7 +147,10 @@ class AuthenticatedHandler(RequestHandler):
 
     @property
     def cookie_name(self):
-        return self.settings.get('cookie_name', '')
+        default_cookie_name = 'username-{host}'.format(
+            host=self.request.host,
+        ).replace(':', '-')
+        return self.settings.get('cookie_name', default_cookie_name)
     
     @property
     def password(self):
diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py
index 9a0cbfe98..7ba521042 100644
--- a/IPython/frontend/html/notebook/notebookapp.py
+++ b/IPython/frontend/html/notebook/notebookapp.py
@@ -166,7 +166,6 @@ class NotebookWebApplication(web.Application):
             # authentication
             cookie_secret=os.urandom(1024),
             login_url=url_path_join(base_project_url,'/login'),
-            cookie_name='username-%s' % uuid.uuid4(),
             read_only=ipython_app.read_only,
             password=ipython_app.password,