diff --git a/server/channels/app/authentication.go b/server/channels/app/authentication.go
index aa5ac146780..9a1aa44a19f 100644
--- a/server/channels/app/authentication.go
+++ b/server/channels/app/authentication.go
@@ -340,7 +340,7 @@ func (a *App) CheckUserPreflightAuthenticationCriteria(rctx request.CTX, user *m
 	}
 
 	if err := checkUserNotBot(user); err != nil {
-		return err
+		return model.AsAppError(err)
 	}
 
 	if err := checkUserLoginAttempts(user, *a.Config().ServiceSettings.MaximumLoginAttempts); err != nil {
@@ -446,7 +446,7 @@ func checkUserNotDisabled(user *model.User) *model.AppError {
 	return nil
 }
 
-func checkUserNotBot(user *model.User) *model.AppError {
+func checkUserNotBot(user *model.User) error {
 	if user.IsBot {
 		return model.NewAppError("Login", "api.user.login.bot_login_forbidden.app_error", nil, "user_id="+user.Id, http.StatusUnauthorized)
 	}
diff --git a/server/channels/app/login.go b/server/channels/app/login.go
index c64d5e2d08f..10d4b412942 100644
--- a/server/channels/app/login.go
+++ b/server/channels/app/login.go
@@ -53,8 +53,8 @@ func (a *App) AuthenticateUserForLogin(rctx request.CTX, id, loginId, password,
 		if err = checkUserNotDisabled(user); err != nil {
 			return nil, err
 		}
-		if err = checkUserNotBot(user); err != nil {
-			return nil, err
+		if err := checkUserNotBot(user); err != nil {
+			return nil, model.AsAppError(err)
 		}
 		if user.LastLogin > 0 {
 			return nil, model.NewAppError("AuthenticateUserForLogin",