diff --git a/src/d_netinfo.cpp b/src/d_netinfo.cpp
index 12fb187ae..d2dbc862d 100644
--- a/src/d_netinfo.cpp
+++ b/src/d_netinfo.cpp
@@ -861,7 +861,7 @@ void D_ReadUserInfoStrings (int pnum, BYTE **stream, bool update)
 					val.String = CleanseString(value.LockBuffer());
 					(*cvar_ptr)->SetGenericRep(val, CVAR_String);
 					value.UnlockBuffer();
-					if (keyname == NAME_Name && update && oldname != value)
+					if (keyname == NAME_Name && update && oldname.Compare (value))
 					{
 						Printf("%s is now known as %s\n", oldname.GetChars(), value.GetChars());
 					}
diff --git a/src/menu/playermenu.cpp b/src/menu/playermenu.cpp
index 641b0699f..58b08fc38 100644
--- a/src/menu/playermenu.cpp
+++ b/src/menu/playermenu.cpp
@@ -996,7 +996,10 @@ bool DPlayerMenu::MenuEvent (int mkey, bool fromcontroller)
 				// item specific handling comes here
 
 			case NAME_Playerbox:
-				PlayerNameChanged(li);
+				if (mkey == MKEY_Input)
+				{
+					PlayerNameChanged(li);
+				}
 				break;
 
 			case NAME_Team: