Fix login, controllers