diff --git a/frappe/core/doctype/user_permission/test_user_permission.py b/frappe/core/doctype/user_permission/test_user_permission.py
index 2fa9917daf..8731954556 100644
--- a/frappe/core/doctype/user_permission/test_user_permission.py
+++ b/frappe/core/doctype/user_permission/test_user_permission.py
@@ -8,6 +8,9 @@ import frappe
 import unittest
 
 class TestUserPermission(unittest.TestCase):
+	def setUp(self):
+		frappe.db.sql("DELETE FROM `tabUser Permission` WHERE `user`='test_bulk_creation_update@example.com'")
+
 	def test_default_user_permission_validation(self):
 		user = create_user('test_default_permission@example.com')
 		param = get_params(user, 'User', user.name, is_default=1)
@@ -21,39 +24,70 @@ class TestUserPermission(unittest.TestCase):
 		''' Create User permission for User having access to all applicable Doctypes'''
 		user = create_user('test_bulk_creation_update@example.com')
 		param = get_params(user, 'User', user.name)
-		created = add_user_permissions(param)
-		self.assertEquals(created, 1)
+		is_created = add_user_permissions(param)
+		self.assertEquals(is_created, 1)
+
+	def test_for_apply_to_all_on_update_from_apply_all(self):
+		user = create_user('test_bulk_creation_update@example.com')
+		param = get_params(user, 'User', user.name)
+
+		# Initially create User Permission document with apply_to_all checked
+		is_created = add_user_permissions(param)
+
+		self.assertEquals(is_created, 1)
+		is_created = add_user_permissions(param)
+
+		# User Permission should not be changed
+		self.assertEquals(is_created, 0)
 
 	def test_for_applicable_on_update_from_apply_to_all(self):
 		''' Update User Permission from all to some applicable Doctypes'''
 		user = create_user('test_bulk_creation_update@example.com')
-		param = get_params(user, 'User', user.name , applicable = ["Chat Room", "Chat Message"])
-		create = add_user_permissions(param)
+		param = get_params(user,'User', user.name, applicable = ["Chat Room", "Chat Message"])
+
+		# Initially create User Permission document with apply_to_all checked
+		is_created = add_user_permissions(get_params(user, 'User', user.name))
+
+		self.assertEquals(is_created, 1)
+
+		is_created = add_user_permissions(param)
 		frappe.db.commit()
 
 		removed_apply_to_all = frappe.db.exists("User Permission", get_exists_param(user))
-		created_applicable_first = frappe.db.exists("User Permission", get_exists_param(user, applicable = "Chat Room"))
-		created_applicable_second = frappe.db.exists("User Permission", get_exists_param(user, applicable = "Chat Message"))
+		is_created_applicable_first = frappe.db.exists("User Permission", get_exists_param(user, applicable = "Chat Room"))
+		is_created_applicable_second = frappe.db.exists("User Permission", get_exists_param(user, applicable = "Chat Message"))
 
+		# Check that apply_to_all is removed
 		self.assertIsNone(removed_apply_to_all)
-		self.assertIsNotNone(created_applicable_first)
-		self.assertIsNotNone(created_applicable_second)
-		self.assertEquals(create, 1)
+
+		# Check that User Permissions for applicable is created
+		self.assertIsNotNone(is_created_applicable_first)
+		self.assertIsNotNone(is_created_applicable_second)
+		self.assertEquals(is_created, 1)
 
 	def test_for_apply_to_all_on_update_from_applicable(self):
 		''' Update User Permission from some to all applicable Doctypes'''
 		user = create_user('test_bulk_creation_update@example.com')
-		param = get_params(user, 'User', user.name)
-		created = add_user_permissions(param)
-		created_apply_to_all = frappe.db.exists("User Permission", get_exists_param(user))
+		param = get_params(user, 'User', user.name,)
+
+		# create User permissions that with applicable
+		is_created = add_user_permissions(get_params(user, 'User', user.name, applicable = ["Chat Room", "Chat Message"]))
+
+		self.assertEquals(is_created, 1)
+
+		is_created = add_user_permissions(param)
+		is_created_apply_to_all = frappe.db.exists("User Permission", get_exists_param(user))
 		removed_applicable_first = frappe.db.exists("User Permission", get_exists_param(user, applicable = "Chat Room"))
 		removed_applicable_second = frappe.db.exists("User Permission", get_exists_param(user, applicable = "Chat Message"))
 
+		# To check that a User permission with apply_to_all exists
+		self.assertIsNotNone(is_created_apply_to_all)
 
-		self.assertIsNotNone(created_apply_to_all)
+		# Check that all User Permission with applicable is removed
 		self.assertIsNone(removed_applicable_first)
 		self.assertIsNone(removed_applicable_second)
-		self.assertEquals(created, 1)
+		self.assertEquals(is_created, 1)
+
 
 def create_user(email):
 	''' create user with role system manager '''
diff --git a/frappe/core/doctype/user_permission/user_permission.py b/frappe/core/doctype/user_permission/user_permission.py
index af2815a9ac..8c1dd51be3 100644
--- a/frappe/core/doctype/user_permission/user_permission.py
+++ b/frappe/core/doctype/user_permission/user_permission.py
@@ -182,12 +182,17 @@ def add_user_permissions(data):
 	data = frappe._dict(data)
 
 	d = check_applicable_doc_perm(data.user, data.doctype, data.docname)
-	exists = frappe.db.exists("User Permission", {"user": data.user, "allow": data.doctype, "for_value": data.docname, "apply_to_all_doctypes": 1})
+	exists = frappe.db.exists("User Permission", {
+		"user": data.user,
+		"allow": data.doctype,
+		"for_value": data.docname,
+		"apply_to_all_doctypes": 1
+	})
 	if data.apply_to_all_doctypes == 1 and not exists:
 		remove_applicable(d, data.user, data.doctype, data.docname)
 		insert_user_perm(data.user, data.doctype, data.docname, data.is_default, apply_to_all = 1)
 		return 1
-	else:
+	elif len(data.applicable_doctypes) > 0 and data.apply_to_all_doctypes != 1:
 		remove_apply_to_all(data.user, data.doctype, data.docname)
 		update_applicable(d, data.applicable_doctypes, data.user, data.doctype, data.docname)
 		for applicable in data.applicable_doctypes :