Add username support - fixes #1