diff --git a/src/main/java/com/ffii/fpsms/modules/user/entity/UserRepository.java b/src/main/java/com/ffii/fpsms/modules/user/entity/UserRepository.java
index 597ce7e..f23b117 100644
--- a/src/main/java/com/ffii/fpsms/modules/user/entity/UserRepository.java
+++ b/src/main/java/com/ffii/fpsms/modules/user/entity/UserRepository.java
@@ -14,5 +14,5 @@ public interface UserRepository extends AbstractRepository<User, Long> {
 
   Optional<User> findByUsernameAndDeletedFalse(String username);
 
-  List<UserCombo> findUserComboByTitleNotNullAndDepartmentNotNull();
+  List<UserCombo> findUserComboByTitleNotNullAndDepartmentNotNullAndNameNotNullAndDeletedFalse();
 }
diff --git a/src/main/java/com/ffii/fpsms/modules/user/service/UserService.java b/src/main/java/com/ffii/fpsms/modules/user/service/UserService.java
index e316b4a..2a124c9 100644
--- a/src/main/java/com/ffii/fpsms/modules/user/service/UserService.java
+++ b/src/main/java/com/ffii/fpsms/modules/user/service/UserService.java
@@ -272,6 +272,6 @@ public class UserService extends AbstractBaseEntityService<User, Long, UserRepos
 	}
 
 	public List<UserCombo> getEscalationCombo() {
-		return userRepository.findUserComboByTitleNotNullAndDepartmentNotNull();
+		return userRepository.findUserComboByTitleNotNullAndDepartmentNotNullAndNameNotNullAndDeletedFalse();
 	}
 }