properly set up user/pw access & tenant name for both cmd & unless