diff --git a/user/editlib.php b/user/editlib.php
index c89dd96..27f982f 100644
--- a/user/editlib.php
+++ b/user/editlib.php
@@ -83,7 +83,8 @@ function useredit_shared_definition(&$mform) {
     $nameordercheck = new object();
     $nameordercheck->firstname = 'a';
     $nameordercheck->lastname  = 'b';
-    if (fullname($nameordercheck) == 'b a' ) {  // See MDL-4325
+    $fullname = fullname($nameordercheck);
+    if ($fullname == 'b a' || $fullname == 'ba') {  // See MDL-4325
         $mform->addElement('text', 'lastname',  get_string('lastname'),  'maxlength="100" size="30"');
         $mform->addElement('text', 'firstname', get_string('firstname'), 'maxlength="100" size="30"');
     } else {