diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index ceab85d6b0..5314698194 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -62,7 +62,7 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa
 
 def check_permission_and_not_submitted(doc, ignore_permissions=False):
 	# permission
-	if not ignore_permissions and frappe.session.user!="Administrator" and not doc.has_permission("cancel"):
+	if not ignore_permissions and frappe.session.user!="Administrator" and not doc.has_permission("delete"):
 		frappe.msgprint(_("User not allowed to delete."), raise_exception=True)
 
 	# check if submitted
diff --git a/frappe/public/js/frappe/ui/field_group.js b/frappe/public/js/frappe/ui/field_group.js
index e5fd712b45..4f736d987d 100644
--- a/frappe/public/js/frappe/ui/field_group.js
+++ b/frappe/public/js/frappe/ui/field_group.js
@@ -33,9 +33,10 @@ frappe.ui.FieldGroup = frappe.ui.form.Layout.extend({
 		var me = this;
 		$(this.body).find('input[type="text"], input[type="password"]').keypress(function(e) {
 			if(e.which==13) {
+				e.preventDefault();
 				$(me.body).find('.btn-primary:first').click();
 			}
-		})
+		});
 	},
 	get_input: function(fieldname) {
 		var field = this.fields_dict[fieldname];
@@ -49,7 +50,7 @@ frappe.ui.FieldGroup = frappe.ui.form.Layout.extend({
 			if(f.get_parsed_value) {
 				var v = f.get_parsed_value();
 
-				if(f.df.reqd && !v) 
+				if(f.df.reqd && !v)
 					errors.push('- ' + __(f.df.label) + "<br>");
 
 				if(v) ret[f.df.fieldname] = v;
@@ -74,7 +75,7 @@ frappe.ui.FieldGroup = frappe.ui.form.Layout.extend({
 			f.set_input(val);
 		}
 	},
-	set_values: function(dict) {	
+	set_values: function(dict) {
 		for(var key in dict) {
 			if(this.fields_dict[key]) {
 				this.set_value(key, dict[key]);
@@ -85,7 +86,7 @@ frappe.ui.FieldGroup = frappe.ui.form.Layout.extend({
 		for(key in this.fields_dict) {
 			var f = this.fields_dict[key];
 			if(f) {
-				f.set_input(f.df['default'] || '');				
+				f.set_input(f.df['default'] || '');
 			}
 		}
 	},