Fixed navigator issue after login
Fixed issue after login for real this time