Seperated out the username a bit more when joining

Signed-off-by: Steven Downer <grinch@outlook.com>