BUG FIX: Primary Address is not refreshed in OrderManager