Index: /branches/release-41/lib/MT/L10N/es.pm
===================================================================
--- /branches/release-41/lib/MT/L10N/es.pm (revision 2796)
+++ /branches/release-41/lib/MT/L10N/es.pm (revision 2820)
@@ -1099,5 +1099,5 @@
 	'User requires password recovery word/phrase' => 'El usario necesita una palabra/frase de recuperaciÃ³n de contraseÃ±a',
 	'Email Address is required for password recovery' => 'La direcciÃ³n de correo es necesaria para la recuperaciÃ³n de la contraseÃ±a',
-	'Website URL is imperfect' => 'La URL del sitio es incorrecta',
+	'Website URL is invalid' => 'La URL del sitio es incorrecta',
 	'User \'[_1]\' (ID:[_2]) created by \'[_3]\'' => 'Usuario \'[_1]\' (ID:[_2]) creado por \'[_3]\'',
 	'User \'[_1]\' (ID:[_2]) deleted by \'[_3]\'' => 'Usuario \'[_1]\' (ID:[_2]) borrado por \'[_3]\'',
Index: /branches/release-41/lib/MT/L10N/fr.pm
===================================================================
--- /branches/release-41/lib/MT/L10N/fr.pm (revision 2782)
+++ /branches/release-41/lib/MT/L10N/fr.pm (revision 2820)
@@ -1099,5 +1099,5 @@
 	'User requires password recovery word/phrase' => 'L\'utilisateur a besoin d\'une phrase de rÃ©cupÃ©ration de mot de passe',
 	'Email Address is required for password recovery' => 'L\'adresse email est nÃ©cessaire pour rÃ©cupÃ©rer le mot de passe',
-	'Website URL is imperfect' => 'L\'URL du site web n\'est pas valide',
+	'Website URL is invalid' => 'L\'URL du site web n\'est pas valide',
 	'User \'[_1]\' (ID:[_2]) created by \'[_3]\'' => 'Utilisateur \'[_1]\' (ID:[_2]) crÃ©Ã© par \'[_3]\'',
 	'User \'[_1]\' (ID:[_2]) deleted by \'[_3]\'' => 'Utilisateur \'[_1]\' (ID:[_2]) supprimÃ© par \'[_3]\'',
Index: /branches/release-41/lib/MT/L10N/de.pm
===================================================================
--- /branches/release-41/lib/MT/L10N/de.pm (revision 2768)
+++ /branches/release-41/lib/MT/L10N/de.pm (revision 2820)
@@ -1092,5 +1092,5 @@
 	'User requires password recovery word/phrase' => 'Passwort-Erinnerungssatz erforderlich',
 	'Email Address is required for password recovery' => 'E-Mail-Adresse erforderlich (fÃŒr Passwort-Anforderungen)',
-	'Website URL is imperfect' => 'Website-URL ungÃŒltig',
+	'Website URL is invalid' => 'Website-URL ungÃŒltig',
 	'User \'[_1]\' (ID:[_2]) created by \'[_3]\'' => 'Benutzer \'[_1]\' (ID:[_2]) angelegt von \'[_3]\'',
 	'User \'[_1]\' (ID:[_2]) deleted by \'[_3]\'' => 'Benutzer \'[_1]\' (ID:[_2]) gelÃ¶scht von \'[_3]\'',
Index: /branches/release-41/lib/MT/L10N/nl.pm
===================================================================
--- /branches/release-41/lib/MT/L10N/nl.pm (revision 2782)
+++ /branches/release-41/lib/MT/L10N/nl.pm (revision 2820)
@@ -1099,5 +1099,5 @@
 	'User requires password recovery word/phrase' => 'Gebruiker heeft een woord/uitdrukking nodig om het wachtwoord te kunnen terugvinden',
 	'Email Address is required for password recovery' => 'E-mail adres is vereist voor het terugvinden van een wachtwoord',
-	'Website URL is imperfect' => 'Website URL is imperfect',
+	'Website URL is invalid' => 'Website URL is imperfect',
 	'User \'[_1]\' (ID:[_2]) created by \'[_3]\'' => 'Gebruiker \'[_1]\' (ID:[_2]) aangemaakt door \'[_3]\'',
 	'User \'[_1]\' (ID:[_2]) deleted by \'[_3]\'' => 'Gebruiker \'[_1]\' (ID:[_2]) verwijderd door \'[_3]\'',
Index: /branches/release-41/lib/MT/L10N/ja.pm
===================================================================
--- /branches/release-41/lib/MT/L10N/ja.pm (revision 2806)
+++ /branches/release-41/lib/MT/L10N/ja.pm (revision 2820)
@@ -1214,5 +1214,5 @@
 	'Email Address is required for password recovery' => 'ã¡ãŒã«ã¢ãã¬ã¹ã¯ãã¹ã¯ãŒããåèš­å®ã§ããããã«ããããã«å¿
 èŠã§ãã',
-	'Website URL is imperfect' => 'URLãäžå®å
+	'Website URL is invalid' => 'URLãäžå®å
 šã§ãã',
 	'User \'[_1]\' (ID:[_2]) created by \'[_3]\'' => '\'[_3]\'ããŠãŒã¶ãŒ\'[_1]\'(ID:[_2])ãäœæããŸããã',
Index: /branches/release-41/lib/MT/CMS/User.pm
===================================================================
--- /branches/release-41/lib/MT/CMS/User.pm (revision 2774)
+++ /branches/release-41/lib/MT/CMS/User.pm (revision 2820)
@@ -1557,4 +1557,5 @@
     my $name     = $app->param('name');
     my $nickname = $app->param('nickname');
+
     if ( $pref eq 'MT' ) {
         if ( defined $name ) {
@@ -1564,11 +1565,14 @@
         return $eh->error( $app->translate("User requires username") )
           if ( !$name );
-
-        if ( defined $nickname ) {
-            $nickname =~ s/(^\s+|\s+$)//g;
-            $app->param( 'nickname', $nickname );
-        }
+    }
+
+    # Display name is required for all auth types; for new users
+    # under external auth, the field is not shown, so the value is
+    # undefined. Only check requirement if the value is defined.
+    if ( defined $nickname ) {
+        $nickname =~ s/(^\s+|\s+$)//g;
+        $app->param( 'nickname', $nickname );
         return $eh->error( $app->translate("User requires display name") )
-          if ( !$nickname );
+          if ( !length( $nickname ) );
     }
 
@@ -1614,5 +1618,5 @@
     if ( $app->param('url') ) {
         my $url = $app->param('url');
-        return $eh->error( MT->translate("Website URL is imperfect") )
+        return $eh->error( MT->translate("Website URL is invalid") )
           unless is_url($url);
     }
