Fixing client joining and dafaults