Fixed login and navigation behaviour