Fix some issues with User sign_in.