diff --git a/src/main/java/emu/lunarcore/game/player/Player.java b/src/main/java/emu/lunarcore/game/player/Player.java
index 7e08ac3..28c1ccc 100644
--- a/src/main/java/emu/lunarcore/game/player/Player.java
+++ b/src/main/java/emu/lunarcore/game/player/Player.java
@@ -99,6 +99,7 @@ public class Player {
     private int entryId;
     
     private IntSet unlockedHeadIcons;
+    private long lastActiveTime;
     
     // Player managers
     private transient GameSession session;
@@ -649,10 +650,16 @@ public class Player {
             this.enterScene(GameConstants.START_ENTRY_ID, 0, false);
         }
         
-        // Set flag
+        // Set logged in flag
+        this.lastActiveTime = System.currentTimeMillis() / 1000;
         this.loggedIn = true;
     }
     
+    public void onLogout() {
+        this.loggedIn = false;
+        this.lastActiveTime = System.currentTimeMillis() / 1000;
+    }
+    
     // Database
 
     public void save() {
@@ -726,6 +733,7 @@ public class Player {
                 .setLevel(this.getLevel())
                 .setOnlineStatus(this.isOnline() ? FriendOnlineStatus.FRIEND_ONLINE_STATUS_ONLINE : FriendOnlineStatus.FRIEND_ONLINE_STATUS_OFFLINE)
                 .setPlatformType(PlatformType.PC)
+                .setLastActiveTime(this.getLastActiveTime())
                 .setSimpleAvatarInfo(SimpleAvatarInfo.newInstance().setAvatarId(GameConstants.TRAILBLAZER_AVATAR_ID).setLevel(1)) // TODO
                 .setHeadIcon(this.getHeadIcon());
         
diff --git a/src/main/java/emu/lunarcore/server/game/GameSession.java b/src/main/java/emu/lunarcore/server/game/GameSession.java
index 182cfe4..ace957c 100644
--- a/src/main/java/emu/lunarcore/server/game/GameSession.java
+++ b/src/main/java/emu/lunarcore/server/game/GameSession.java
@@ -80,9 +80,13 @@ public class GameSession {
         this.state = SessionState.INACTIVE;
 
         if (player != null) {
+            // Handle player logout event
+            player.onLogout();
+            
             // Save first
             player.save();
-            // Deregister
+            
+            // Deregister player from server
             this.getServer().deregisterPlayer(player);
         }
     }