Fix unless to use user/pw & admin tenant / namespace