Improve JoinDialog