Fix joining with password in other locations