Finish sign in
Fix merge from sign-in-out