fix the default values for token and password auth

Change-Id: Ie0cd80ce1dcf5186367896e1a84a441dc2e2c72d
Fixes: Bug #1213216
Merge "fix the default values for token and password auth"