Fix #36 - Make the username optional