Better Sign In & Sign Out handling