diff --git a/ietf/person/models.py b/ietf/person/models.py
index 027d71d15..dad650a18 100644
--- a/ietf/person/models.py
+++ b/ietf/person/models.py
@@ -94,7 +94,8 @@ class PersonInfo(models.Model):
 
     def photo_name(self,thumb=False):
         hasher = Hashids(salt='Person photo name salt',min_length=5)
-        return '%s-%s%s' % ( slugify(self.ascii), hasher.encode(self.id), '-th' if thumb else '' )
+        _, first, _, last, _ = name_parts(self.ascii)
+        return '%s-%s%s' % ( slugify("%s %s" % (first, last)), hasher.encode(self.id), '-th' if thumb else '' )
 
     class Meta:
         abstract = True
diff --git a/ietf/person/name.py b/ietf/person/name.py
index fe5824260..e3d83ad80 100644
--- a/ietf/person/name.py
+++ b/ietf/person/name.py
@@ -13,7 +13,7 @@ def name_parts(name):
     if len(parts) > 2 and parts[0] in ["M", "M.", "Sri", ] and "." not in parts[1]:
         prefix = parts[0];
         parts = parts[1:]
-    if parts[0] in ["Mr", "Mr.", "Mrs", "Mrs.", "Ms", "Ms.", "Miss", "Dr.", "Doctor", "Prof", "Prof.", "Professor", "Sir", "Lady", "Dame", ]:
+    if parts[0] in ["Mr", "Mr.", "Mrs", "Mrs.", "Ms", "Ms.", "Miss", "Dr", "Dr.", "Doctor", "Prof", "Prof.", "Professor", "Sir", "Lady", "Dame", ]:
         prefix = parts[0];
         parts = parts[1:]
     if len(parts) > 2:
@@ -52,4 +52,4 @@ if __name__ == "__main__":
     name = " ".join(sys.argv[1:])
     print name_parts(name)
     print initials(name)
-    
\ No newline at end of file
+