diff --git a/app/code/Magento/Messaging/view/frontend/templates/room.phtml b/app/code/Magento/Messaging/view/frontend/templates/room.phtml
index 5b557d2d4cac396d2d324f91759dde731a0aefd0..e0088236c4238bd481e510a8955033c5e0ae639c 100644
--- a/app/code/Magento/Messaging/view/frontend/templates/room.phtml
+++ b/app/code/Magento/Messaging/view/frontend/templates/room.phtml
@@ -21,7 +21,7 @@
             <div>
                 <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="message" type="text" name="chattext" class="message-content" onkeypress="send2(event)">
                 <input id="send" type="submit" class="send-button" onclick="send()">
             </div>
         </div>
@@ -33,13 +33,15 @@
         $(document).ready(function() {
             myFirebase.on('child_added', function(snapshot) {
                 var msg = snapshot.val();
-                if (((msg.sender=="person1")&&(msg.receiver=="person2"))||((msg.sender=="person2")&&(msg.receiver=="person1"))) {
+                var sender = document.getElementById("sender").value;
+                var receiver = document.getElementById("receiver").value;
+                if (((msg.sender==sender)&&(msg.receiver==receiver))||((msg.sender==receiver)&&(msg.receiver==sender))) {
                     var msgTextElement = document.createElement("p");
                     msgTextElement.textContent = msg.message;
         
-                    if (msg.sender=="person1"){
+                    if (msg.sender==sender){
                         msgTextElement.classList.add('sendermessage');
-                    } else if (msg.sender=="person2") {
+                    } else if (msg.sender==receiver) {
                         msgTextElement.classList.add('receivemessage');
                     } else {
                         
@@ -53,15 +55,29 @@
         });
     });
     function send() {
-        console.log("masuk");
         var sender = document.getElementById("sender").value;
         var receiver = document.getElementById("receiver").value;
         var message = document.getElementById("message").value;
-        myFirebase.push({
-            sender: sender,
-            receiver: receiver,
-            message: message
-        });
+        if (message != "") {
+            myFirebase.push({
+                sender: sender,
+                receiver: receiver,
+                message: message
+            });
+        }
         document.getElementById("message").value = "";
-  }
+    }
+    function send2(e) {
+        if (e.keyCode == 13) {
+            var message = document.getElementById("message").value;
+            if (message != "") {
+                myFirebase.push({
+                    sender: sender,
+                    receiver: receiver,
+                    message: message
+                });
+            }
+            document.getElementById("message").value = "";
+        }
+    }
 </script>
\ No newline at end of file