Bug fix for order/tenant creation;