updated login2 and fix sign in