diff --git a/daemon.py b/daemon.py
index eca4d926c..714b9bc3b 100644
--- a/daemon.py
+++ b/daemon.py
@@ -3019,7 +3019,7 @@ class PubServer(BaseHTTPRequestHandler):
             editor = None
             if nickname:
                 editor = isEditor(baseDir, nickname)
-            if not hashtag or not nickname or not editor:
+            if not hashtag or not editor:
                 if callingDomain.endswith('.onion') and \
                    onionDomain:
                     actorStr = \
diff --git a/webapp_search.py b/webapp_search.py
index e0a783947..1d0a3636f 100644
--- a/webapp_search.py
+++ b/webapp_search.py
@@ -676,13 +676,11 @@ def htmlHashtagSearch(cssCache: {},
     if isEditor(baseDir, nickname):
         category = getHashtagCategory(baseDir, hashtag)
         hashtagSearchForm += '<div class="hashtagCategoryContainer">\n'
-        hashtagSearchForm += '  <form method="POST" action="' + \
+        hashtagSearchForm += '  <form enctype="multipart/form-data" ' + \
+            'method="POST" accept-charset="UTF-8" action="' + \
             '/users/' + nickname + '/tags/' + hashtag + \
             '/sethashtagcategory">\n'
         hashtagSearchForm += '    <center>\n'
-        hashtagSearchForm += \
-            '      <input type="hidden" name="hashtagName" value="' + \
-            hashtag + '">\n'
         hashtagSearchForm += translate['Category']
         hashtagSearchForm += \
             '      <input type="text" style="width: 20ch" ' + \