diff --git a/daemon.py b/daemon.py
index b4a6ac73f..df3957370 100644
--- a/daemon.py
+++ b/daemon.py
@@ -1448,7 +1448,14 @@ class PubServer(BaseHTTPRequestHandler):
                     searchHandle = moderationText
                     if searchHandle:
                         if '@' not in searchHandle:
-                            searchHandle = None
+                            # is this a local nickname on this instance?
+                            localHandle = \
+                                searchHandle + '@' + self.server.domain
+                            if os.path.isdir(self.server.baseDir +
+                                             '/accounts/' + localHandle):
+                                searchHandle = localHandle
+                            else:
+                                searchHandle = None
                     if searchHandle:
                         msg = \
                             htmlAccountInfo(self.server.cssCache,