diff --git a/airgun/entities/discoveredhosts.py b/airgun/entities/discoveredhosts.py
index 5b7c3fa49..f7ad64bcd 100644
--- a/airgun/entities/discoveredhosts.py
+++ b/airgun/entities/discoveredhosts.py
@@ -98,6 +98,8 @@ def provision(
         else:
             view.customize_create.click()
             discovered_host_edit_view = DiscoveredHostEditProvisioningView(self.browser)
+            if 'operating_system.root_password' in host_values.keys():
+                discovered_host_edit_view.operating_system.disable_passwd.click()
             discovered_host_edit_view.fill(host_values)
             self.browser.click(discovered_host_edit_view.submit, ignore_ajax=True)
             self.browser.plugin.ensure_page_safe(timeout='120s')
diff --git a/airgun/views/host.py b/airgun/views/host.py
index 960c4e20c..05350ef3c 100644
--- a/airgun/views/host.py
+++ b/airgun/views/host.py
@@ -389,6 +389,7 @@ class operating_system(SatTab):
         ptable = FilteredDropdown(id='host_ptable')
         disk = TextInput(id='host_disk')
         root_password = TextInput(id='host_root_pass')
+        disable_passwd = Text('//a[@id="disable-pass-btn"]')
 
     @View.nested
     class interfaces(SatTab):