Updated so that finding a user by email works.