1 files changed, 5 insertions, 1 deletions

diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 1dff0cc..7b05794 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -878,10 +878,14 @@ void LLPanelLogin::loadLoginForm()
                 {
                         username_l->setText(firstname_s);
                 }
-                else
+                else if (!firstname_s.empty() && !lastname_s.empty())
                 {
                         username_l->setText(firstname_s+"."+lastname_s);
                 }
+                else
+                {
+                        username_l->clear();
+                }
         }
         else
         {