diff --git a/petnames.py b/petnames.py
index a758c50f4..da5cc3d46 100644
--- a/petnames.py
+++ b/petnames.py
@@ -116,5 +116,5 @@ def resolvePetnames(baseDir: str, nickname: str, domain: str,
         if not handle:
             continue
         # replace the petname with the handle
-        content = content.replace(wrd + ' ', handle)
+        content = content.replace(wrd + ' ', handle + ' ')
     return content