diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py
index ea870509fa..1ce40fbcf2 100644
--- a/frappe/core/doctype/communication/communication.py
+++ b/frappe/core/doctype/communication/communication.py
@@ -27,7 +27,7 @@ class Communication(Document):
 		return self.parent_doc
 
 	def validate(self):
-		if not self.status:
+		if self.get("__islocal"):
 			if self.reference_doctype and self.reference_name:
 				self.status = "Linked"
 
diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js
index 751e514325..6e3be6f969 100644
--- a/frappe/public/js/frappe/form/footer/timeline.js
+++ b/frappe/public/js/frappe/form/footer/timeline.js
@@ -227,14 +227,22 @@ frappe.ui.form.Comments = Class.extend({
 			btn: btn,
 			callback: function(r) {
 				if(!r.exc) {
-					var comment_exists = !!$.map(me.get_comments(), function(x) {
-						return x.name == r.message.name? true : undefined}).length;
 					me.input.val("");
+
+					var comment = r.message;
+					var comments = me.get_comments();
+					var comment_exists = false;
+					for (var i=0, l=comments.length; i<l; i++) {
+						if (comments[i].name==comment.name) {
+							comment_exists = true;
+							break;
+						}
+					}
 					if (comment_exists) {
 						return;
 					}
-					me.frm.get_docinfo().comments =
-						me.get_comments().concat([r.message]);
+
+					me.frm.get_docinfo().comments = comments.concat([r.message]);
 					me.refresh(true);
 				}
 			}
diff --git a/socketio.js b/socketio.js
index 6717176ffb..88ba1c4dcf 100644
--- a/socketio.js
+++ b/socketio.js
@@ -108,7 +108,7 @@ function get_doc_room(socket, doctype, docname) {
 }
 
 function get_user_room(socket, user) {
-	return get_site_room(socket) + ':user:' + user;
+	return get_site_name(socket) + ':user:' + user;
 }
 
 function get_site_room(socket) {