Updated some signin logic