diff --git a/client/index.html b/client/index.html
index 4a3d274..ad61912 100644
--- a/client/index.html
+++ b/client/index.html
@@ -204,10 +204,11 @@
 						</button>
 					</div>
 					<div class="modal-body" id="disconnectionModalDescription">
-						Connection was lost with the server you were connected to. Moved back to welcome screen.
+						Connection was lost with the server you were connected to, probably caused by a server stop.
 					</div>
 					<div class="modal-footer">
-						<button type="button" class="btn btn-secondary" data-dismiss="modal" id="disconnectionModalCloseButton">Close</button>
+						<button type="button" class="btn btn-primary" data-dismiss="modal" id="disconnectionModalCloseButton">Close</button>
+						<button type="button" class="btn btn-secondary" data-dismiss="modal" id="disconnectionModalWelcomeScreenButton">Welcome screen</button>
 					</div>
 				</div>
 			</div>
diff --git a/client/scripts/WebConsole.js b/client/scripts/WebConsole.js
index 9fa64ff..a52f9da 100644
--- a/client/scripts/WebConsole.js
+++ b/client/scripts/WebConsole.js
@@ -25,6 +25,8 @@ function openServer(serverName){
 	//Change server name and related info
 	$("#serverTitle").text(serverName);
 	$("#consoleTextArea").text("");
+	$("#commandInput").prop("disabled", false);
+	$("#sendCommandButton").prop("disabled", false);
 	
 	//New server, new variables:
 	autoPasswordCompleted = false;
@@ -199,7 +201,9 @@ function writeRamInfo(free, used, total){
 */
 function closedConnection(serverName){
 	if(connectionManager.activeConnection.serverName == serverName){
-		backToHomepage();
+		//Disable command input and button
+		$("#commandInput").prop("disabled", true);
+		$("#sendCommandButton").prop("disabled", true);
 		
 		//Inform user
 		$('#disconnectionModal').modal('show');
diff --git a/client/scripts/WebConsoleJqueryHandler.js b/client/scripts/WebConsoleJqueryHandler.js
index d7709ec..7dc278a 100644
--- a/client/scripts/WebConsoleJqueryHandler.js
+++ b/client/scripts/WebConsoleJqueryHandler.js
@@ -182,6 +182,13 @@ $("#navbarHomeLink").click(function() {
 	backToHomepage();
 });
 
+/**
+* On DisconnectedModal, back to welcome screen clicked
+*/
+$("#disconnectionModalWelcomeScreenButton").click(function() {
+	backToHomepage();
+});
+
 /**
 * On Settings link clicked
 */
diff --git a/client/scripts/WebConsoleLanguage.js b/client/scripts/WebConsoleLanguage.js
index dc48554..f0d2c6e 100644
--- a/client/scripts/WebConsoleLanguage.js
+++ b/client/scripts/WebConsoleLanguage.js
@@ -32,7 +32,7 @@ function setLanguage(locale){
 				"passwordModalCloseButton": "Close",
 				"passwordSendButton": "Login",
 				"disconnectionModalLongTitle": "Disconnected",
-				"disconnectionModalDescription": "Connection was lost with the server you were connected to, probably caused by a server stop. Moved back to welcome screen.",
+				"disconnectionModalDescription": "Connection was lost with the server you were connected to, probably caused by a server stop.",
 				"disconnectionModalCloseButton": "Close",
 				"settingsLink": "Settings",
 				"settingsModalLongTitle": "WebConsole Settings",
@@ -68,7 +68,7 @@ function setLanguage(locale){
 				"passwordModalCloseButton": "Cerrar",
 				"passwordSendButton": "Iniciar sesión",
 				"disconnectionModalLongTitle": "Desconectado",
-				"disconnectionModalDescription": "Se ha perdido la conexión con el servidor al que estabas conectado. Esto puede ser debido a que el servidor se ha cerrado. Se ha vuelto a la ventana principal.",
+				"disconnectionModalDescription": "Se ha perdido la conexión con el servidor al que estabas conectado. Esto puede ser debido a que el servidor se ha cerrado.",
 				"disconnectionModalCloseButton": "Cerrar",
 				"settingsLink": "Configuración",
 				"settingsModalLongTitle": "Configuración de WebConsole",
@@ -176,7 +176,7 @@ function setLanguage(locale){
 				"passwordModalCloseButton": "关闭",
 				"passwordSendButton": "登录",
 				"disconnectionModalLongTitle": "已断开",
-				"disconnectionModalDescription": "与服务器的通信中断, 可能是因为服务器停止运行. 已回到欢迎界面.",
+				"disconnectionModalDescription": "与服务器的通信中断, 可能是因为服务器停止运行.",
 				"disconnectionModalCloseButton": "关闭",
 				"settingsLink": "设定值",
 				"settingsModalLongTitle": "WebConsole 设定值",
@@ -212,7 +212,7 @@ function setLanguage(locale){
 				"passwordModalCloseButton": "Fermer",
 				"passwordSendButton": "S'identifier",
 				"disconnectionModalLongTitle": "Débranché",
-				"disconnectionModalDescription": "La connexion a été perdue avec le serveur auquel vous étiez connecté, probablement en raison d'un arrêt du serveur. Revenu à l'écran d'accueil.",
+				"disconnectionModalDescription": "La connexion a été perdue avec le serveur auquel vous étiez connecté, probablement en raison d'un arrêt du serveur.",
 				"disconnectionModalCloseButton": "Fermer",
 				"settingsLink": "Réglages",
 				"settingsModalLongTitle": "Réglages de WebConsole",
@@ -248,7 +248,7 @@ function setLanguage(locale){
 				"passwordModalCloseButton": "Zavřít",
 				"passwordSendButton": "Přihlásit se",
 				"disconnectionModalLongTitle": "Odpojeno",
-				"disconnectionModalDescription": "Připojení se ztratilo se serverem, ke kterému jste byli připojeni, pravděpodobně způsobené zastavením serveru. Vrátil se zpět na uvítací obrazovku.",
+				"disconnectionModalDescription": "Připojení se ztratilo se serverem, ke kterému jste byli připojeni, pravděpodobně způsobené zastavením serveru.",
 				"disconnectionModalCloseButton": "Zavřít",
 				"settingsLink": "Nastavení",
 				"settingsModalLongTitle": "Nastavení WebConsole",