diff --git a/active_checks.py b/active_checks.py
index aae43a2..325a484 100644
--- a/active_checks.py
+++ b/active_checks.py
@@ -1269,11 +1269,10 @@ register_rule(group,
                                  allow_empty = False,
                                  size = 60,
                              ),
-                             Password(
+                             IndividualOrStoredPassword(
                                  title = _("Password"),
                                  help = _("Password for binding, if your server requires an authentication"),
                                  allow_empty = False,
-                                 size = 20,
                              )
                         ]
                       )
diff --git a/check_ldap b/check_ldap
index cba2b36..f55119d 100644
--- a/check_ldap
+++ b/check_ldap
@@ -24,6 +24,9 @@
 # to the Free Software Foundation, Inc., 51 Franklin St,  Fifth Floor,
 # Boston, MA 02110-1301 USA.
 
+import cmk.password_store
+cmk.password_store.replace_passwords()
+
 def check_ldap_arguments(params):
     name, basedn, settings = params