diff --git a/daemon.py b/daemon.py
index 79573ca8f..092e23d03 100644
--- a/daemon.py
+++ b/daemon.py
@@ -1046,7 +1046,7 @@ class PubServer(BaseHTTPRequestHandler):
 
         # Show the calendar for a user
         if htmlGET and '/users/' in self.path:
-           if '/calendar?' in self.path:
+           if '/calendar' in self.path:
                # show the calendar screen
                msg=htmlCalendar(self.server.translate, \
                                 self.server.baseDir,self.path).encode()
diff --git a/utils.py b/utils.py
index adabf576b..919feac97 100644
--- a/utils.py
+++ b/utils.py
@@ -310,7 +310,7 @@ def validNickname(domain: str,nickname: str) -> bool:
             return False
     if nickname==domain:
         return False
-    reservedNames=['inbox','dm','outbox','following','public','followers','capabilities']
+    reservedNames=['inbox','dm','outbox','following','public','followers','capabilities','calendar','tlreplies','tlmedia','moderation']
     if nickname in reservedNames:
         return False
     return True