diff --git a/erpnext/hr/doctype/department_approver/department_approver.py b/erpnext/hr/doctype/department_approver/department_approver.py
index 6626ece..9b2de0e 100644
--- a/erpnext/hr/doctype/department_approver/department_approver.py
+++ b/erpnext/hr/doctype/department_approver/department_approver.py
@@ -48,7 +48,7 @@
 		field_name = "Expense Approver"
 	elif filters.get("doctype") == "Shift Request":
 		parentfield = "shift_request_approver"
-		field_name = "Approver"
+		field_name = "Shift Request Approver"
 	if department_list:
 		for d in department_list:
 			approvers += frappe.db.sql("""select user.name, user.first_name, user.last_name from
diff --git a/erpnext/hr/doctype/shift_assignment/shift_assignment.py b/erpnext/hr/doctype/shift_assignment/shift_assignment.py
index 20553b9..4f5b59b 100644
--- a/erpnext/hr/doctype/shift_assignment/shift_assignment.py
+++ b/erpnext/hr/doctype/shift_assignment/shift_assignment.py
@@ -41,7 +41,7 @@
 			select name, shift_type, start_date ,end_date, docstatus, status
 			from `tabShift Assignment`
 			where
-				employee=%(employee)s and docstatus < 2
+				employee=%(employee)s and docstatus = 1
 				and name != %(name)s
 				and status = "Active"
 				{0}
@@ -53,14 +53,11 @@
 			"name": self.name
 		}, as_dict = 1)
 
-		for shift in assigned_shifts:
-			if shift.name:
-				self.throw_overlap_error(shift)
+		if len(assigned_shifts):
+			self.throw_overlap_error(assigned_shifts[0])
 
 	def throw_overlap_error(self, shift_details):
 		shift_details = frappe._dict(shift_details)
-		if shift_details.docstatus == 0:
-			msg = _("Employee {0} has already applied for {1}: {2}").format(frappe.bold(self.employee), frappe.bold(self.shift_type), frappe.bold(shift_details.name))
 		if shift_details.docstatus == 1 and shift_details.status == "Active":
 			msg = _("Employee {0} already has Active Shift {1}: {2}").format(frappe.bold(self.employee), frappe.bold(self.shift_type), frappe.bold(shift_details.name))
 		if shift_details.start_date:
diff --git a/erpnext/hr/doctype/shift_type/shift_type.py b/erpnext/hr/doctype/shift_type/shift_type.py
index dd08d31..054e7e3 100644
--- a/erpnext/hr/doctype/shift_type/shift_type.py
+++ b/erpnext/hr/doctype/shift_type/shift_type.py
@@ -78,8 +78,10 @@
 			if shift_details and shift_details.shift_type.name == self.name:
 				mark_attendance(employee, date, 'Absent', self.name)
 
-	def get_assigned_employee(self, consider_default_shift=False):
-		filters = {'shift_type': self.name, 'docstatus': '1'}
+	def get_assigned_employee(self, from_date=None, consider_default_shift=False):
+		filters = {'start_date':('>', from_date), 'shift_type': self.name, 'docstatus': '1'}
+		if not from_date:
+			del filters["start_date"]
 
 		assigned_employees = frappe.get_all('Shift Assignment', 'employee', filters, as_list=True)
 		assigned_employees = [x[0] for x in assigned_employees]