diff --git a/Erupe/server/channelserver/handlers.go b/Erupe/server/channelserver/handlers.go
index 1a0f12ae1..e4b268786 100644
--- a/Erupe/server/channelserver/handlers.go
+++ b/Erupe/server/channelserver/handlers.go
@@ -181,6 +181,8 @@ func handleMsgSysLogin(s *Session, p mhfpacket.MHFPacket) {
 	}
 
 	doAckSimpleSucceed(s, pkt.AckHandle, bf.Data())
+
+	updateRights(s)
 }
 
 func handleMsgSysLogout(s *Session, p mhfpacket.MHFPacket) {
diff --git a/Erupe/server/channelserver/handlers_quest.go b/Erupe/server/channelserver/handlers_quest.go
index fc0d2e4c6..86a0003b9 100644
--- a/Erupe/server/channelserver/handlers_quest.go
+++ b/Erupe/server/channelserver/handlers_quest.go
@@ -34,7 +34,7 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) {
 			// Get quest file.
 			data, err := ioutil.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, fmt.Sprintf("quests/%s.bin", pkt.Filename)))
 			if err != nil {
-				panic(err)
+				s.logger.Fatal(fmt.Sprintf("Failed to open quest file: quests/%s.bin", pkt.Filename))
 			}
 			doAckBufSucceed(s, pkt.AckHandle, data)
 		}
@@ -68,8 +68,6 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) {
 	} else {
 		doAckBufSucceed(s, pkt.AckHandle, data)
 	}
-	// Update the client's rights as well:
-	updateRights(s)
 }
 
 func handleMsgMhfEnterTournamentQuest(s *Session, p mhfpacket.MHFPacket) {}