diff --git a/models/user.go b/models/user.go
index 38f699740..78ab4627a 100755
--- a/models/user.go
+++ b/models/user.go
@@ -1556,6 +1556,18 @@ func GetUserByActivateEmail(email string) (*User, error) {
 	if len(users) >= 1 {
 		return &users[0],nil
 	}else {
+		// Finally, if email address is the protected email address:用户邮件地址设置为隐藏电子邮件地址
+		if strings.HasSuffix(email, fmt.Sprintf("@%s", setting.Service.NoReplyAddress)) {
+			username := strings.TrimSuffix(email, fmt.Sprintf("@%s", setting.Service.NoReplyAddress))
+			user := &User{LowerName: username}
+			has, err := ctx.e.Get(user)
+			if err != nil {
+				return nil, err
+			}
+			if has {
+				return user, nil
+			}
+		}
 		return nil, errors.New("cannot find user by email")
 	}
 }