diff --git a/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml b/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
index d3afc5ee12d2518037a2217559485ac5769b0011..14f77c9f09d53be74f4ae37f8fb794cd54e339d2 100644
--- a/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
+++ b/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
@@ -1,3 +1,13 @@
+<?php
+    $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+    $customerSession = $objectManager->get('Magento\Customer\Model\Session');
+    $email = "";
+    if ($customerSession->isLoggedIn()) { 
+        $email = $customerSession->getCustomer()->getEmail();
+    } else {
+        $email = "";
+    }
+?>
 <div class="box" >
 	<div class = "chat-title">
 		<span class="name">Chats</span>
@@ -21,7 +31,7 @@
             myFirebase.on("child_added", function(snapshot) {
               var chatrooms = snapshot.val();
             
-            if ((chatrooms.sender=="person1")||(chatrooms.receiver=="person1")){
+            if ((chatrooms.sender==<?= $email ?>)||(chatrooms.receiver==<?= $email ?>)){
             	var chatlist = document.getElementById("chatlist");
             	//Kalo usernamenya sama, hapus yang sebelumnya
             	for (i = 0; i < chatlist.childElementCount; i++) { 
@@ -31,7 +41,7 @@
 				   	}
 				}
 
-	            var chatroom_item = document.createElement("div");
+	            var chatroom_item = document.createElement('a');
 	            chatroom_item.classList.add('chatroom-item');
 
 	            var chatroom_username = document.createElement("div");
@@ -41,10 +51,12 @@
 	            chatroom_lastmessage.classList.add('chatroom-lastmessage');
 
 	            var chatroom_username_span = document.createElement("span"); 
-            	if (chatrooms.sender=="person1") {
+            	if (chatrooms.sender==<?= $email ?>) {
             		chatroom_username_span.textContent = chatrooms.receiver;
+                chatroom_item.href = "/messaging/room/?email=" + chatrooms.receiver;
             	} else {
             		chatroom_username_span.textContent = chatrooms.sender;
+                chatroom_item.href = "/messaging/room/?email=" + chatrooms.sender;
             	}
 	            
 	            chatroom_username.appendChild(chatroom_username_span);
diff --git a/app/code/Magento/Messaging/view/frontend/templates/room.phtml b/app/code/Magento/Messaging/view/frontend/templates/room.phtml
index ac4bc49a4c279dfb681947db2ce771f0679f0503..5b557d2d4cac396d2d324f91759dde731a0aefd0 100644
--- a/app/code/Magento/Messaging/view/frontend/templates/room.phtml
+++ b/app/code/Magento/Messaging/view/frontend/templates/room.phtml
@@ -1,15 +1,17 @@
+<?php
+    $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+    $customerSession = $objectManager->get('Magento\Customer\Model\Session');
+    $email = "";
+    if ($customerSession->isLoggedIn()) { 
+        $email = $customerSession->getCustomer()->getEmail();
+    } else {
+        $email = "";
+    }
+?>
 <div class="box">
     <div class = "chat-title">
         <span class="name">
-            <?php
-                $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-                $customerSession = $objectManager->get('Magento\Customer\Model\Session');
-                if ($customerSession->isLoggedIn()) { 
-                    echo   $customerSession->getCustomer()->getEmail();  // get  Last Name
-                } else {
-                    echo "Kosong";
-                }
-            ?>
+            <?= $email ?>
         </span>
     </div>
     <div class="chat-form" >
@@ -17,8 +19,8 @@
         </div>
         <div class="chat-input">
             <div>
-                <input id="sender" type="hidden" value="person1">
-                <input id="receiver" type="hidden" value="person2">
+                <input id="sender" type="hidden" value="<?= $email ?>">
+                <input id="receiver" type="hidden" value="<?= $_GET['email'] ?>">
                 <input id="message" type="text" name="chattext" class="message-content">
                 <input id="send" type="submit" class="send-button" onclick="send()">
             </div>