diff --git a/models/user.go b/models/user.go
index 4dd2ad8d89..f3a74f5e08 100644
--- a/models/user.go
+++ b/models/user.go
@@ -1271,22 +1271,27 @@ func GetUser(user *User) (bool, error) {
 
 // SearchUserOptions contains the options for searching
 type SearchUserOptions struct {
-	Keyword  string
-	Type     UserType
-	OrderBy  string
-	Page     int
-	PageSize int // Can be smaller than or equal to setting.UI.ExplorePagingNum
-	IsActive util.OptionalBool
+	Keyword       string
+	Type          UserType
+	OrderBy       string
+	Page          int
+	PageSize      int // Can be smaller than or equal to setting.UI.ExplorePagingNum
+	IsActive      util.OptionalBool
+	SearchByEmail bool // Search by email as well as username/full name
 }
 
 func (opts *SearchUserOptions) toConds() builder.Cond {
 	var cond builder.Cond = builder.Eq{"type": opts.Type}
 	if len(opts.Keyword) > 0 {
 		lowerKeyword := strings.ToLower(opts.Keyword)
-		cond = cond.And(builder.Or(
+		keywordCond := builder.Or(
 			builder.Like{"lower_name", lowerKeyword},
 			builder.Like{"LOWER(full_name)", lowerKeyword},
-		))
+		)
+		if opts.SearchByEmail {
+			keywordCond = keywordCond.Or(builder.Like{"LOWER(email)", lowerKeyword})
+		}
+		cond = cond.And(keywordCond)
 	}
 
 	if !opts.IsActive.IsNone() {
diff --git a/routers/admin/users.go b/routers/admin/users.go
index c22accc202..1081f3092f 100644
--- a/routers/admin/users.go
+++ b/routers/admin/users.go
@@ -31,8 +31,9 @@ func Users(ctx *context.Context) {
 	ctx.Data["PageIsAdminUsers"] = true
 
 	routers.RenderUserSearch(ctx, &models.SearchUserOptions{
-		Type:     models.UserTypeIndividual,
-		PageSize: setting.UI.Admin.UserPagingNum,
+		Type:          models.UserTypeIndividual,
+		PageSize:      setting.UI.Admin.UserPagingNum,
+		SearchByEmail: true,
 	}, tplUsers)
 }