diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index f44d1810df..990163e864 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -265,8 +265,8 @@ void ClientNetworkGameSocketHandler::ClientError(NetworkRecvStatus res)
 				_network_first_time = false;
 				SendAck();
 				extern bool novahost();
-				if(novahost()){ 
-					NetworkClientSendChat(NETWORK_ACTION_CHAT_CLIENT, DESTTYPE_CLIENT, CLIENT_ID_SERVER, "!check 1400");//check version
+				if(novahost()){
+					NetworkClientSendChat(NETWORK_ACTION_CHAT_CLIENT, DESTTYPE_CLIENT, CLIENT_ID_SERVER, "!check 1401");//check version
 					NetworkClientSendChat(NETWORK_ACTION_CHAT_CLIENT, DESTTYPE_CLIENT, CLIENT_ID_SERVER, "!synccb"); //CB cargo data
 					CB_SetCB(false);
 				}
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 4b5617a405..61bdc8278d 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -134,7 +134,7 @@ public:
 		CompanyID company = (CompanyID)this->result;
 		SetDParam(0, company);
 		SetDParam(1, company);
-		return GetStringBoundingBox(STR_COMPANY_NAME_COMPANY_NUM).width + this->icon_size.width + 3;
+		return GetStringBoundingBox(STR_COMPANY_NAME_COMPANY_NUM).width + this->icon_size.width + this->lockwidth + 3;
 	}
 
 	uint Height(uint width) const