Login/controller fix