Fix for login and navigation