diff --git a/Erupe/server/channelserver/handlers.go b/Erupe/server/channelserver/handlers.go
index 6f2779095..c52bf9623 100644
--- a/Erupe/server/channelserver/handlers.go
+++ b/Erupe/server/channelserver/handlers.go
@@ -175,10 +175,7 @@ func handleMsgSysLogin(s *Session, p mhfpacket.MHFPacket) {
 		panic(err)
 	}
 
-	var uid int
-	_ = s.server.db.QueryRow("SELECT u.id FROM users u INNER JOIN characters c ON u.id = c.user_id WHERE c.id=$1", s.charID).Scan(&uid)
-
-	_, err = s.server.db.Exec("UPDATE users u SET last_character=$1 WHERE u.id=$2", s.charID, uid)
+	_, err = s.server.db.Exec("UPDATE users u SET last_character=$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$1)", s.charID)
 	if err != nil {
 		panic(err)
 	}