fixed login, I hope
merge