diff --git a/app/models/User.java b/app/models/User.java
index 2d40f54f3..df98e7af5 100644
--- a/app/models/User.java
+++ b/app/models/User.java
@@ -299,7 +299,7 @@ public static Page<User> findUsers(int pageNum, String query, UserState state) {
 
         if(StringUtils.isNotBlank(query)) {
             el = el.disjunction();
-            el = el.icontains("loginId", query).icontains("name", query);
+            el = el.icontains("loginId", query).icontains("name", query).icontains("email", query);
             el.endJunction();
         }
 
diff --git a/conf/messages b/conf/messages
index 6c896826e..ac15b6d82 100644
--- a/conf/messages
+++ b/conf/messages
@@ -760,7 +760,7 @@ site.user.deleteConfirm = Are you sure you want this user to leave?
 site.userList.deleteAlert = This user cannot be deleted because this user is the only manager of the project.
 site.userList.deleted = Deleted user
 site.userList.locked = Locked user
-site.userList.search = Find user by login ID or user name
+site.userList.search = Find user by login ID, user name or email
 site.userList.unlocked = Unlocked user
 title = Title
 title.boardList = Board
diff --git a/conf/messages.ko b/conf/messages.ko
index 3b8c6385e..f7a3ad824 100644
--- a/conf/messages.ko
+++ b/conf/messages.ko
@@ -761,7 +761,7 @@ site.user.deleteConfirm = 정말로 해당 사용자를 사이트에서 탈퇴
 site.userList.deleteAlert = 프로젝트의 유일한 관리자이므로 사이트에서 삭제할 수 없습니다.
 site.userList.deleted = 삭제된 사용자
 site.userList.locked = 계정이 잠긴 사용자
-site.userList.search = 찾으려는 사용자의 ID 또는 이름 입력하세요
+site.userList.search = 찾으려는 사용자의 ID, 이름 또는 이메일을 입력하세요
 site.userList.unlocked = 활성화된 사용자
 title = 제목
 title.boardList = 게시판