check login:
merge conflicts sorted, added checked if login