Fixed the auth issues and config

Change-Id: I0ee8deaef7f49c2c456ee0f5c5363e7c46f85c1d