diff --git a/daemon.py b/daemon.py
index 76ed6d7b9..7fd7523cc 100644
--- a/daemon.py
+++ b/daemon.py
@@ -10375,7 +10375,7 @@ class PubServer(BaseHTTPRequestHandler):
 
         # redirect to the welcome screen
         if htmlGET and authorized and usersInPath and \
-           not self.path.endswith('/welcome'):
+           '/welcome' not in self.path:
             nickname = self.path.split('/users/')[1]
             if '/' in nickname:
                 nickname = nickname.split('/')[0]
diff --git a/utils.py b/utils.py
index 8f2348062..25499145e 100644
--- a/utils.py
+++ b/utils.py
@@ -1273,7 +1273,8 @@ def _isReservedName(nickname: str) -> bool:
                      'likes', 'users', 'statuses', 'tags',
                      'accounts', 'channels', 'profile', 'u',
                      'updates', 'repeat', 'announce',
-                     'shares', 'fonts', 'icons', 'avatars')
+                     'shares', 'fonts', 'icons', 'avatars',
+                     'welcome')
     if nickname in reservedNames:
         return True
     return False