Fix some bugs with sign in again