diff --git a/src/level/player_profile.cpp b/src/level/player_profile.cpp
index d3603f1c..bedd76cd 100644
--- a/src/level/player_profile.cpp
+++ b/src/level/player_profile.cpp
@@ -133,7 +133,7 @@ std::string CPlayerProfile::GetLastName()
 {
     std::string name;
 
-    if(!GetConfigFile().GetStringProperty("Gamer", "LastName", name))
+    if(!GetConfigFile().GetStringProperty("Gamer", "LastName", name) || name.empty())
         GetResource(RES_TEXT, RT_NAME_DEFAULT, name);
 
     return name;
diff --git a/src/ui/screen/screen_player_select.cpp b/src/ui/screen/screen_player_select.cpp
index 4bcd139b..e3a9c2f3 100644
--- a/src/ui/screen/screen_player_select.cpp
+++ b/src/ui/screen/screen_player_select.cpp
@@ -40,6 +40,8 @@
 #include "ui/controls/list.h"
 #include "ui/controls/window.h"
 
+#include <boost/algorithm/string/trim.hpp>
+
 namespace Ui
 {
 
@@ -245,6 +247,7 @@ void CScreenPlayerSelect::UpdateNameControl()
     total = pl->GetTotal();
     sel   = pl->GetSelect();
     name = pe->GetText(100);
+    boost::trim(name);
 
     pb = static_cast<CButton*>(pw->SearchControl(EVENT_INTERFACE_NDELETE));
     if ( pb != nullptr )
@@ -379,6 +382,7 @@ bool CScreenPlayerSelect::NameCreate()
 
     std::string name;
     name = pe->GetText(100);
+    boost::trim(name);
     if ( name.empty() )
     {
         m_sound->Play(SOUND_TZOING);