Fix bug with user passwords using the wrong user id