diff --git a/source/glest_game/menu/menu_state_options.cpp b/source/glest_game/menu/menu_state_options.cpp
index ac187d27..0b67cb47 100644
--- a/source/glest_game/menu/menu_state_options.cpp
+++ b/source/glest_game/menu/menu_state_options.cpp
@@ -174,7 +174,8 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu, Program
 		labelPlayerNameLabel.setText(lang.getString("Playername"));
 
 		labelPlayerName.init(currentColumnStart,currentLine);
-		labelPlayerName.setText(config.getString("NetPlayerName",Socket::getHostName().c_str()));
+		string steamPlayerName = safeCharPtrCopy(getenv("SteamAppUser"),100);
+		labelPlayerName.setText(config.getString("NetPlayerName",(steamPlayerName != "" ? steamPlayerName.c_str() : Socket::getHostName().c_str())));
 		labelPlayerName.setFont(CoreData::getInstance().getMenuFontBig());
 		labelPlayerName.setFont3D(CoreData::getInstance().getMenuFontBig3D());
 		labelPlayerName.setEditable(true);