diff --git a/README.md b/README.md
index 7636369..2860c41 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Don't worry about privacy or security: all data is stored in your browser locall
 * Real-time connected players, machine CPU and server RAM usage information.
 * Capable of keeping active connections to more than one server to keep retrieving console log in the background for them all.
 * English, Spanish, Chinese (thanks to Neubulae and OPhantomO), Czech (thanks to Tada), Deutsch (thanks to NoNamePro0), Dutch (thanks to Twockx), French (thanks to pickatchou999), Italian (thanks to AlexZap), Korean (thanks to XxPKBxX), Portuguese (thanks to AlexandreMuassab and Connect500BR), Russian (thanks to Stashenko) and Turkish (thanks to acarnd03) supported.
-* Free, updated regularly, and many more!
+* Free!
 
 ![Screenshot](https://i.imgur.com/sN1sYju.png)
 
diff --git a/client/scripts/WebConsoleLanguage.js b/client/scripts/WebConsoleLanguage.js
index 29ed5d3..6d71825 100644
--- a/client/scripts/WebConsoleLanguage.js
+++ b/client/scripts/WebConsoleLanguage.js
@@ -22,8 +22,8 @@ function setLanguage(locale){
 				"addServerModalSvName": "Server name:",
 				"addServerModalSvIp": "Server IP:",
 				"addServerModalSvPort": "WebConsole port:",
-				"addServerModalSvSsl": "Server is SSL enabled",
-				"addServerModalSslAdvice": "SSL is required for HTTPS client connections",
+				"addServerModalSvSsl": "SSL is enabled on the server",
+				"addServerModalSslAdvice": "SSL is required for connections made from HTTPS websites",
 				"addServerModalClose": "Close",
 				"saveAndConnectServerButton": "Save and connect",
 				"passwordModalLongTitle": "Password required",
diff --git a/src/es/mesacarlos/webconsole/WebConsole.java b/src/es/mesacarlos/webconsole/WebConsole.java
index 7d31445..1bccafb 100644
--- a/src/es/mesacarlos/webconsole/WebConsole.java
+++ b/src/es/mesacarlos/webconsole/WebConsole.java
@@ -52,7 +52,7 @@ public class WebConsole extends JavaPlugin {
 		try {
 			server.stop();
 			wsThread = null;
-		} catch (IOException | InterruptedException e) {
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
diff --git a/src/es/mesacarlos/webconsole/auth/LoginManager.java b/src/es/mesacarlos/webconsole/auth/LoginManager.java
index d6d062f..2dd6cfb 100644
--- a/src/es/mesacarlos/webconsole/auth/LoginManager.java
+++ b/src/es/mesacarlos/webconsole/auth/LoginManager.java
@@ -28,7 +28,7 @@ public class LoginManager {
 	 * @param address User to logout
 	 */
 	public void logOut(InetSocketAddress address) {
-		for(ConnectedUser user : loggedInUsers)
+		for(ConnectedUser user : loggedInUsers.toArray(new ConnectedUser[loggedInUsers.size()]))
 			if(user.getSocketAddress().equals(address))
 				loggedInUsers.remove(user);
 	}
diff --git a/src/es/mesacarlos/webconsole/websocket/WSServer.java b/src/es/mesacarlos/webconsole/websocket/WSServer.java
index 9ce9c46..d09753b 100644
--- a/src/es/mesacarlos/webconsole/websocket/WSServer.java
+++ b/src/es/mesacarlos/webconsole/websocket/WSServer.java
@@ -105,6 +105,7 @@ public class WSServer extends WebSocketServer {
 		try {
 			conn.send(content.toJSON());
 		}catch(WebsocketNotConnectedException e) {
+			LoginManager.getInstance().logOut(conn.getRemoteSocketAddress());
 			Bukkit.getLogger().warning(Internationalization.getPhrase("error-disconnected-client"));
 		}