diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
index ff3518858..b039b3c92 100644
--- a/ipaserver/install/bindinstance.py
+++ b/ipaserver/install/bindinstance.py
@@ -1211,9 +1211,13 @@ class BindInstance(service.Service):
         # disabled by default, by ldap_enable()
         if enabled:
             self.enable()
+        else:
+            self.disable()
 
         if running:
             self.restart()
+        else:
+            self.stop()
 
         self.named_regular.unmask()
         if named_regular_enabled: