Added Username Optional Parameter - Updated

From API branch
Merge