diff --git a/frappe/templates/includes/comments/comments.html b/frappe/templates/includes/comments/comments.html
index 7460b9d4a9..bde4972c5b 100644
--- a/frappe/templates/includes/comments/comments.html
+++ b/frappe/templates/includes/comments/comments.html
@@ -97,7 +97,7 @@
 				return false;
 			}
 
-			if (args.comment_by!=='Administrator' && !valid_email(args.comment_by)) {
+			if (args.comment_by!=='Administrator' && !validate_email(args.comment_by)) {
 				frappe.msgprint("{{ _("Please enter a valid email address.") }}");
 				return false;
 			}
diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js
index c8d66d5875..b424ec88b0 100644
--- a/frappe/templates/includes/login/login.js
+++ b/frappe/templates/includes/login/login.js
@@ -35,7 +35,7 @@ login.bind_events = function() {
 		args.email = ($("#signup_email").val() || "").trim();
 		args.redirect_to = frappe.utils.get_url_arg("redirect-to") || '';
 		args.full_name = ($("#signup_fullname").val() || "").trim();
-		if(!args.email || !valid_email(args.email) || !args.full_name) {
+		if(!args.email || !validate_email(args.email) || !args.full_name) {
 			login.set_indicator("{{ _("Valid email and name required") }}", 'red');
 			return false;
 		}