diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py
index d2ca0d0d27..cb4a2d3773 100644
--- a/frappe/core/doctype/communication/communication.py
+++ b/frappe/core/doctype/communication/communication.py
@@ -100,7 +100,7 @@ class Communication(Document):
 	def set_sender_full_name(self):
 		if not self.sender_full_name and self.sender:
 			if self.sender == "Administrator":
-				self.sender_full_name = self.sender
+				self.sender_full_name = frappe.db.get_value("User", "Administrator", "full_name")
 				self.sender = frappe.db.get_value("User", "Administrator", "email")
 			elif self.sender == "Guest":
 				self.sender_full_name = self.sender
diff --git a/frappe/desk/notifications.py b/frappe/desk/notifications.py
index 565b1ddc07..66d8851a89 100644
--- a/frappe/desk/notifications.py
+++ b/frappe/desk/notifications.py
@@ -69,6 +69,7 @@ def get_notifications_for(notification_type, config, notification_count):
 
 				frappe.cache().hset("notification_count:" + m, frappe.session.user, open_count[m])
 		except frappe.PermissionError:
+			frappe.clear_messages()
 			pass
 			# frappe.msgprint("Permission Error in notifications for {0}".format(m))
 
@@ -94,6 +95,7 @@ def get_notifications_for_doctypes(config, notification_count):
 						result = frappe.get_attr(condition)()
 
 				except frappe.PermissionError:
+					frappe.clear_messages()
 					pass
 					# frappe.msgprint("Permission Error in notifications for {0}".format(d))
 
diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js
index dced067fd1..9e3970194e 100644
--- a/frappe/public/js/frappe/form/footer/timeline.js
+++ b/frappe/public/js/frappe/form/footer/timeline.js
@@ -216,17 +216,13 @@ frappe.ui.form.Timeline = Class.extend({
 	},
 
 	prepare_timeline_item: function(c) {
-		if(!c.sender) c.sender = this.frm.doc.owner;
+		if(!c.sender) c.sender = c.owner;
 
 		if(c.sender && c.sender.indexOf("<")!==-1) {
 			c.sender = c.sender.split("<")[1].split(">")[0];
 		}
 
-		if(c.sender) {
-			c.user_info = frappe.user_info(c.sender);
-		} else {
-			c.user_info = frappe.user_info(c.owner);
-		}
+		c.user_info = frappe.user_info(c.sender);
 
 		c["delete"] = "";
 		c["edit"] = "";
diff --git a/frappe/public/js/frappe/form/footer/timeline_item.html b/frappe/public/js/frappe/form/footer/timeline_item.html
index 7ad4a2c9f2..5242118b71 100755
--- a/frappe/public/js/frappe/form/footer/timeline_item.html
+++ b/frappe/public/js/frappe/form/footer/timeline_item.html
@@ -26,7 +26,7 @@
 				|| data.communication_type==="Feedback"
 				|| (data.communication_type==="Comment"
 					&& data.comment_type==="Comment")) { %}
-			<div class="comment-header small" style="cursor: pointer;">
+			<div class="comment-header small">
 				<i class="{%= data.icon %} fa-fw"></i>
 				<span title="{%= data.comment_by %}">{%= data.fullname %}</span>
 				<span>
diff --git a/frappe/utils/user.py b/frappe/utils/user.py
index 3be4295dfe..4612473faa 100755
--- a/frappe/utils/user.py
+++ b/frappe/utils/user.py
@@ -147,9 +147,9 @@ class UserPermissions:
 			if dt in self.can_read:
 				self.can_read.remove(dt)
 
-		if "System Manager" in self.roles:
-			self.can_import = filter(lambda d: d in self.can_create, frappe.db.sql_list("""select name from `tabDocType`
-				where allow_import = 1"""))
+		if "System Manager" in self.get_roles():
+			self.can_import = filter(lambda d: d in self.can_create,
+				frappe.db.sql_list("""select name from `tabDocType` where allow_import = 1"""))
 
 	def get_defaults(self):
 		import frappe.defaults