diff --git a/petnames.py b/petnames.py
index 2378c9047..9f61c0885 100644
--- a/petnames.py
+++ b/petnames.py
@@ -75,6 +75,13 @@ def getPetName(baseDir: str, nickname: str, domain: str,
             for pet in petnamesList:
                 if pet.endswith(' ' + handle):
                     return pet.replace(' ' + handle, '').strip()
+        elif ' ' + handle.lower() + '\n' in petnamesStr.lower():
+            petnamesList = petnamesStr.split('\n')
+            handle = handle.lower()
+            for pet in petnamesList:
+                if pet.lower().endswith(' ' + handle):
+                    handle2 = pet.split(' ')[-1]
+                    return pet.replace(' ' + handle2, '').strip()
     return ''
 
 
diff --git a/webapp_person_options.py b/webapp_person_options.py
index 35ac8708e..6b55aafd8 100644
--- a/webapp_person_options.py
+++ b/webapp_person_options.py
@@ -235,7 +235,7 @@ def htmlPersonOptions(defaultTimeline: str,
     if authorized:
         if originPathStr == '/users/' + nickname:
             if optionsNickname:
-                handle = optionsNickname + '@' + optionsDomainFull
+                # handle = optionsNickname + '@' + optionsDomainFull
                 petname = getPetName(baseDir, nickname, domain, handle)
                 optionsStr += \
                     '    ' + translate['Petname'] + ': \n' + \