Fix login, controllers 2