Fixing Login and Other contexts navi switching...