Merge "Set auth in clients before they are used"