diff --git a/frappe/public/js/frappe/chat.js b/frappe/public/js/frappe/chat.js
index b51b6451e9..e4dcb1d522 100644
--- a/frappe/public/js/frappe/chat.js
+++ b/frappe/public/js/frappe/chat.js
@@ -949,14 +949,14 @@ frappe.chat.pretty_datetime   = function (date)
 {
     const today    = moment()
     const instance = date.moment
-    
+        
     if ( today.isSame(instance, "d") )
-        return today.format("hh:mm A")
+        return instance.format("hh:mm A")
     else
     if ( today.isSame(instance, "week") )
-        return today.format("dddd")
+        return instance.format("dddd")
     else
-        return today.format("DD/MM/YYYY")
+        return instance.format("DD/MM/YYYY")
 }
 
 // frappe.chat.sound
diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js
index 7fc5da03ae..895a645563 100644
--- a/frappe/public/js/frappe/ui/dialog.js
+++ b/frappe/public/js/frappe/ui/dialog.js
@@ -34,7 +34,7 @@ frappe.ui.Dialog = frappe.ui.FieldGroup.extend({
 
 		// show footer
 		this.action = this.action || { primary: { }, secondary: { } };
-		if(this.primary_action || this.action.primary.label) {
+		if(this.primary_action || !frappe._.is_empty(this.action.primary)) {
 			this.set_primary_action(this.primary_action_label || this.action.primary.label || __("Submit"), this.primary_action || this.action.primary.click);
 		}