Added join and login