With the changes below it no longer return the user id but a user object, right?