diff --git a/GameEngine/Session.php b/GameEngine/Session.php
index ec3c126a..194f50a4 100755
--- a/GameEngine/Session.php
+++ b/GameEngine/Session.php
@@ -278,6 +278,10 @@ class Session {
 };
 $session = new Session;
 $form = new Form;
-$message = new Message;
+
+// if there is no user, we'd try to load messages for user with ID 0, which is wrong
+if ($_SESSION['id_user']) {
+    $message = new Message;
+}
 
 ?>
diff --git a/todo.txt b/todo.txt
index 5b5ab985..8c0ac5ba 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,4 +1,3 @@
-- dorf1.php without being logged-in (but being logged-in via Admin) takes forever to load
 - allow sending Mass Message + System Message from Admin
 - fix editing current task from Taskmaster -> number never match the edited quest after save
 - cannot delete a single medal in admin