Handle login and logout better
fix signup