Finally fixed login