diff --git a/jupyterhub/user.py b/jupyterhub/user.py
index 66b3a944..5b47d32b 100644
--- a/jupyterhub/user.py
+++ b/jupyterhub/user.py
@@ -146,7 +146,7 @@ class User(HasTraits):
     @property
     def escaped_name(self):
         """My name, escaped for use in URLs, cookies, etc."""
-        return quote(self.name, safe='@')
+        return quote(self.name, safe='')
     
     @gen.coroutine
     def spawn(self, options=None):