diff --git a/docs/pokerth.asn1 b/docs/pokerth.asn1
index 3562d1dc..5ba23468 100644
--- a/docs/pokerth.asn1
+++ b/docs/pokerth.asn1
@@ -295,10 +295,11 @@ JoinGameAck ::= SEQUENCE {
 
 JoinGameFailed ::= SEQUENCE {
 	joinGameFailureReason		ENUMERATED {
-		invalidGame		(1),
-		gameIsFull		(2),
-		gameIsRunning	(3),
-		invalidPassword	(4)
+		invalidGame			(1),
+		gameIsFull			(2),
+		gameIsRunning		(3),
+		invalidPassword		(4),
+		notAllowedAsGuest	(5)
 	}
 }
 
diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp
index 65954be7..a1a8d36c 100644
--- a/src/gui/qt/startwindow/startwindowimpl.cpp
+++ b/src/gui/qt/startwindow/startwindowimpl.cpp
@@ -694,7 +694,7 @@ void startWindowImpl::networkError(int errorID, int /*osErrorID*/) {
 		break;
 		case ERR_NET_INVALID_PASSWORD:
 			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Invalid password when joining the game.\nPlease reenter the password and try again."),
+				tr("Invalid login.\nPlease check your username and password."),
 				QMessageBox::Close); }
 		break;
 		case ERR_NET_INVALID_PASSWORD_STR:
@@ -842,6 +842,11 @@ void startWindowImpl::networkNotification(int notificationId)
 				tr("Invalid password when joining the game.\nPlease reenter the password and try again."),
 				QMessageBox::Close); }
 		break;
+		case NTF_NET_JOIN_GUEST_FORBIDDEN:
+			{ QMessageBox::warning(this, tr("Network Notification"),
+				tr("You cannot join this type of game as guest."),
+				QMessageBox::Close); }
+		break;
 		case NTF_NET_NEW_RELEASE_AVAILABLE:
 			{	QMessageBox msgBox(QMessageBox::Information, tr("Network Notification"),
 				tr("A new release of PokerTH is available.<br>Please go to <a href=\"http://www.pokerth.net/\" target=\"_blank\">http://www.pokerth.net</a> and download the latest version."),
diff --git a/src/net/socket_msg.h b/src/net/socket_msg.h
index a70547f9..f45c5ccb 100644
--- a/src/net/socket_msg.h
+++ b/src/net/socket_msg.h
@@ -111,6 +111,7 @@
 #define NTF_NET_JOIN_GAME_FULL			211
 #define NTF_NET_JOIN_ALREADY_RUNNING	212
 #define NTF_NET_JOIN_INVALID_PASSWORD	213
+#define NTF_NET_JOIN_GUEST_FORBIDDEN	214
 
 // Notifications - version
 #define NTF_NET_NEW_RELEASE_AVAILABLE	220