Added join and login client logic