diff --git a/instack_undercloud/tests/test_validator.py b/instack_undercloud/tests/test_validator.py
index 4859c5596..c8aec73e0 100644
--- a/instack_undercloud/tests/test_validator.py
+++ b/instack_undercloud/tests/test_validator.py
@@ -119,3 +119,8 @@ class TestValidator(base.BaseTestCase):
         save_params = dict(params)
         validator.validate_config(params, lambda x: None)
         self.assertEqual(save_params, params)
+
+    def test_allow_all_with_ui(self):
+        self.conf.config(undercloud_admin_vip='10.0.0.10',
+                         generate_service_certificate=True,
+                         enable_ui=True)
diff --git a/instack_undercloud/validator.py b/instack_undercloud/validator.py
index 50a3c05ee..ab2da6c59 100644
--- a/instack_undercloud/validator.py
+++ b/instack_undercloud/validator.py
@@ -76,7 +76,7 @@ def _validate_in_cidr(params, error_callback):
         params['inspection_end'] = inspection_iprange[1]
     validate_addr_in_cidr(params, 'just_local_ip', 'local_ip')
     validate_addr_in_cidr(params, 'network_gateway')
-    if params['undercloud_service_certificate']:
+    if params['undercloud_service_certificate'] and not params['enable_ui']:
         validate_addr_in_cidr(params, 'undercloud_public_vip')
         validate_addr_in_cidr(params, 'undercloud_admin_vip')
     validate_addr_in_cidr(params, 'dhcp_start')