1 files changed, 4 insertions, 3 deletions

diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
index b9c323a2b..d76976ca7 100644
--- a/Mailman/Cgi/admin.py
+++ b/Mailman/Cgi/admin.py
@@ -904,12 +904,11 @@ def membership_options(mlist, subcat, cgidata, doc, form):
                   MemberAdaptor.BYBOUNCE: _('B'),
                   }
     # Now populate the rows
+    lang = mlist.preferred_language
     for addr in members:
         link = Link(mlist.GetOptionsURL(addr, obscure=1),
                     mlist.getMemberCPAddress(addr))
-        fullname = mlist.getMemberName(addr)
-        if fullname is None:
-            fullname = ''
+        fullname = Utils.uncanonstr(mlist.getMemberName(addr), lang)
         name = TextBox(addr + '_realname', fullname, size=longest).Format()
         cells = [Center(CheckBox(addr + '_unsub', 'off', 0).Format()),
                  link.Format() + '<br>' +
@@ -1245,6 +1244,8 @@ def change_options(mlist, category, subcat, cgidata, doc):
         # Now cruise through all the subscribees and do the deed
         for entry in entries:
             fullname, address = parseaddr(entry)
+            # Canonicalize the full name
+            fullname = Utils.canonstr(fullname, mlist.preferred_language)
             userdesc = UserDesc(address, fullname,
                                 Utils.MakeRandomPassword(),
                                 digest, mlist.preferred_language)