From f2e788f4b12517759e016a9f48633597bed82e8f Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 5 May 2016 16:36:42 -0400 Subject: Allow system admins to switch user accounts to email/password (#2893) --- api/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'api/user.go') diff --git a/api/user.go b/api/user.go index f7d3eb1d3..1331bd3da 100644 --- a/api/user.go +++ b/api/user.go @@ -1702,7 +1702,7 @@ func ResetPassword(c *Context, userId, newPassword string) *model.AppError { user = result.Data.(*model.User) } - if len(user.AuthData) != 0 { + if len(user.AuthData) != 0 && !c.IsSystemAdmin() { return model.NewLocAppError("ResetPassword", "api.user.reset_password.sso.app_error", nil, "userId="+user.Id) } -- cgit v1.2.3-1-g7c22