fixed login and controller