fixed login
merged