Tweaking login and routing