Small fixes around checking user log in