diff --git a/src/main/java/client/LoginState.java b/src/main/java/client/LoginState.java
index 695d11a332..74e9aefdaa 100644
--- a/src/main/java/client/LoginState.java
+++ b/src/main/java/client/LoginState.java
@@ -4,7 +4,7 @@ package client;
  * @author Ponk
  */
 public class LoginState {
-    public static final byte NOT_LOGGED_IN = 0;
+    public static final byte NOT_LOGGED_IN = 0; // TODO: rename to LOGGED_OUT
     public static final byte SERVER_TRANSITION = 1;
     public static final byte LOGGED_IN = 2;
 }
diff --git a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java
index 331093ccf3..d74c9ebffb 100644
--- a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java
+++ b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java
@@ -205,7 +205,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
 
                     return;
                 }
-                accountService.logIn(c);
+                accountService.setLoggedIn(c);
             } finally {
                 releaseAccount(accId);
             }
diff --git a/src/main/java/net/server/handlers/login/AcceptToSHandler.java b/src/main/java/net/server/handlers/login/AcceptToSHandler.java
index dfac36d326..7c45be0d92 100644
--- a/src/main/java/net/server/handlers/login/AcceptToSHandler.java
+++ b/src/main/java/net/server/handlers/login/AcceptToSHandler.java
@@ -29,7 +29,7 @@ public final class AcceptToSHandler extends AbstractPacketHandler {
             throw new GameViolationException("ToS not accepted");
         }
 
-        if (!accountService.logIn(c)) {
+        if (!accountService.setLoggedIn(c)) {
             c.sendPacket(PacketCreator.getLoginFailed(7));
         }
 
diff --git a/src/main/java/net/server/handlers/login/AfterLoginHandler.java b/src/main/java/net/server/handlers/login/AfterLoginHandler.java
index 1b0a74fc12..2cc3008924 100644
--- a/src/main/java/net/server/handlers/login/AfterLoginHandler.java
+++ b/src/main/java/net/server/handlers/login/AfterLoginHandler.java
@@ -62,7 +62,7 @@ public final class AfterLoginHandler extends AbstractPacketHandler {
                 c.sendPacket(PacketCreator.requestPinAfterFailure());
             }
         } else if (c2 == 0 && c3 == 5) {
-            accountService.logOut(c);
+            accountService.setLoggedOutAndDisconnect(c);
         }
     }
 }
diff --git a/src/main/java/net/server/handlers/login/LoginPasswordHandler.java b/src/main/java/net/server/handlers/login/LoginPasswordHandler.java
index bc48a7adb9..6951a09df3 100644
--- a/src/main/java/net/server/handlers/login/LoginPasswordHandler.java
+++ b/src/main/java/net/server/handlers/login/LoginPasswordHandler.java
@@ -149,7 +149,7 @@ public final class LoginPasswordHandler implements PacketHandler {
             return;
         }
 
-        if (!accountService.logIn(c)) {
+        if (!accountService.setLoggedIn(c)) {
             c.sendPacket(PacketCreator.getLoginFailed(7));
         }
         removeOnlineAccountChrs(c);
diff --git a/src/main/java/net/server/handlers/login/RegisterPinHandler.java b/src/main/java/net/server/handlers/login/RegisterPinHandler.java
index c1293fc9bd..5b3b27630e 100644
--- a/src/main/java/net/server/handlers/login/RegisterPinHandler.java
+++ b/src/main/java/net/server/handlers/login/RegisterPinHandler.java
@@ -42,7 +42,7 @@ public final class RegisterPinHandler extends AbstractPacketHandler {
     public void handlePacket(InPacket p, Client c) {
         boolean cancel = p.readByte() == 0;
         if (cancel) {
-            accountService.logOut(c);
+            accountService.setLoggedOutAndDisconnect(c);
             return;
         }
 
@@ -51,6 +51,6 @@ public final class RegisterPinHandler extends AbstractPacketHandler {
         c.setPin(pin);
         c.sendPacket(PacketCreator.pinRegistered());
 
-        accountService.logOut(c);
+        accountService.setLoggedOutAndDisconnect(c);
     }
 }
diff --git a/src/main/java/net/server/handlers/login/SetGenderHandler.java b/src/main/java/net/server/handlers/login/SetGenderHandler.java
index 41c8a519a9..e410deece5 100644
--- a/src/main/java/net/server/handlers/login/SetGenderHandler.java
+++ b/src/main/java/net/server/handlers/login/SetGenderHandler.java
@@ -71,7 +71,7 @@ public class SetGenderHandler extends AbstractPacketHandler {
     }
 
     private void logOut(Client c) {
-        accountService.logOut(c);
+        accountService.setLoggedOutAndDisconnect(c);
     }
 
 }
diff --git a/src/main/java/service/AccountService.java b/src/main/java/service/AccountService.java
index 80879d512b..59750e987f 100644
--- a/src/main/java/service/AccountService.java
+++ b/src/main/java/service/AccountService.java
@@ -213,7 +213,7 @@ public class AccountService {
         return accountRepository.setChrSlots(accountId, chrSlots);
     }
 
-    public boolean logIn(Client c) {
+    public boolean setLoggedIn(Client c) {
         byte newState = LoginState.LOGGED_IN;
         int currentState = c.getLoginState();
         if (currentState != LoginState.NOT_LOGGED_IN && currentState != LoginState.SERVER_TRANSITION) {
@@ -224,8 +224,12 @@ public class AccountService {
         return true;
     }
 
-    public void logOut(Client c) {
+    public void setLoggedOutAndDisconnect(Client c) {
         SessionCoordinator.getInstance().closeSession(c, false);
+        setLoggedOut(c);
+    }
+
+    public void setLoggedOut(Client c) {
         setLoginState(c, LoginState.NOT_LOGGED_IN);
     }