Fix login & logout and embedded web view
Fix login & logout and embedded web view