Add space after user name only if needed