diff --git a/daemon.py b/daemon.py
index 9049d5f73..62feced5f 100644
--- a/daemon.py
+++ b/daemon.py
@@ -919,6 +919,8 @@ class PubServer(BaseHTTPRequestHandler):
         if self.headers.get('Cookie'):
             if self.headers['Cookie'].startswith('epicyon='):
                 tokenStr=self.headers['Cookie'].split('=',1)[1]
+                if ';' in tokenStr:
+                    tokenStr=tokenStr.split(';')[0]
                 if self.server.tokensLookup.get(tokenStr):
                     nickname=self.server.tokensLookup[tokenStr]
                     # default to the inbox of the person