fixed login, added user location