Add some fixes for sign ins and make things more clear