Always pass username, even for --token-only

Change-Id: I3cf164a2d6573fe1f8d3e610c859bfa5ad19aaed
Fixes: bug #1160648
Merge "Always pass username, even for --token-only"