Merge "Fix checking of admins in resetPassword"