diff --git a/website/public/API/loadMessages.php b/website/public/API/loadMessages.php
index a02de26..0fdc740 100644
--- a/website/public/API/loadMessages.php
+++ b/website/public/API/loadMessages.php
@@ -9,6 +9,7 @@ require_once("../../queries/friendship.php");
 
 if (isset($_POST["lastID"]) && $_POST["lastID"] != "") {
     echo getNewChatMessages(test_input($_POST["lastID"]), test_input($_POST["destination"]));
+    setLastVisited(test_input($_POST["destination"]));
 } else {
     echo getOldChatMessages(test_input($_POST["destination"]));
     setLastVisited(test_input($_POST["destination"]));
diff --git a/website/views/chat-view.php b/website/views/chat-view.php
index 9b40f71..598b3ee 100644
--- a/website/views/chat-view.php
+++ b/website/views/chat-view.php
@@ -16,6 +16,7 @@
 
                     // Set default values of a friend.
                     $username = $friend["username"];
+                    $name = $friend["name"];
                     $userID = $friend["userID"];
                     $pf = "img/avatar-standard.png";