Basic login & logout workflow improvements