Combine login and register controllers, improve login flow