diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp
index 982d98f9..2315e3ed 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp
@@ -1218,9 +1218,11 @@ void mainWindowImpl::setPlayerAvatar(int myID, QString myAvatar) {
 
 			if(QFile::QFile(myAvatar).exists()) {
 				playerAvatarLabelArray[tmpPlayer->getMyID()]->setPixmap(myAvatar);
+				tmpPlayer->setMyAvatar(myAvatar);
 			}
 			else {
 				playerAvatarLabelArray[tmpPlayer->getMyID()]->setPixmap(QPixmap(myAppDataPath +"gfx/gui/table/default/genereticAvatar.png"));
+				tmpPlayer->setMyAvatar("");
 			}	
 		}	
 	}
diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp
index 02b6cb76..c00bc7b6 100644
--- a/src/net/common/clientthread.cpp
+++ b/src/net/common/clientthread.cpp
@@ -512,6 +512,13 @@ ClientThread::CompleteTempAvatarData(unsigned playerId)
 
 			// Update player info, but never re-request avatar.
 			SetPlayerInfo(playerId, tmpPlayerInfo, false);
+
+			string fileName;
+			if (GetAvatarManager().GetAvatarFileName(tmpPlayerInfo.avatar, fileName))
+			{
+				// Dynamically update avatar in GUI.
+				GetGui().setPlayerAvatar(playerId, fileName);
+			}
 		}
 	}
 	// Free memory.