diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js
index 578956f0ca..403abf0981 100644
--- a/frappe/public/js/frappe/form/layout.js
+++ b/frappe/public/js/frappe/form/layout.js
@@ -98,7 +98,7 @@ frappe.ui.form.Layout = class Layout {
 			// remove previous color
 			this.message.removeClass(this.message_color);
 		}
-		this.message_color = (color && ['yellow', 'blue', 'red'].includes(color)) ? color : 'blue';
+		this.message_color = (color && ['yellow', 'blue', 'red', 'green', 'orange'].includes(color)) ? color : 'blue';
 		if (html) {
 			if (html.substr(0, 1)!=='<') {
 				// wrap in a block
@@ -439,7 +439,7 @@ frappe.ui.form.Layout = class Layout {
 	}
 
 	handle_tab(doctype, fieldname, shift) {
-		let	grid_row = null,
+		let grid_row = null,
 			prev = null,
 			fields = this.fields_list,
 			focused = false;