diff --git a/erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.py b/erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.py
index 04e2692..06cf1ac 100755
--- a/erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.py
+++ b/erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.py
@@ -19,6 +19,6 @@
 	return frappe.db.sql("""select user.name, user.first_name, user.last_name from
 		tabUser user, `tabHas Role` user_role where
 		user_role.role = "Leave Approver"
-		and user_role.parent = user.name and
+		and user_role.parent = user.name and user.enabled and
 		user.name != %s 
-		""", name or "")
\ No newline at end of file
+		""", name or "")
diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py
index d99cdf6..15c5e2a 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.py
+++ b/erpnext/stock/doctype/warehouse/warehouse.py
@@ -177,8 +177,20 @@
 		return frappe.get_value('Account', dict(warehouse=self.name))
 
 	def after_rename(self, old_name, new_name, merge=False):
+		new_warehouse_name = self.get_new_warehouse_name_without_abbr(new_name)
+		self.db_set("warehouse_name", new_warehouse_name)
+				
 		if merge:
 			self.recalculate_bin_qty(new_name)
+			
+	def get_new_warehouse_name_without_abbr(self, name):
+		company_abbr = frappe.db.get_value("Company", self.company, "abbr")
+		parts = name.rsplit(" - ", 1)
+		
+		if parts[-1].lower() == company_abbr.lower():
+			name = parts[0]
+			
+		return name
 
 	def recalculate_bin_qty(self, new_name):
 		from erpnext.stock.stock_balance import repost_stock