Added logincontroller + fix