diff --git a/ldap_user/ldap_user.module b/ldap_user/ldap_user.module
index 4687d2e..59d0ada 100644
--- a/ldap_user/ldap_user.module
+++ b/ldap_user/ldap_user.module
@@ -267,6 +267,15 @@ function ldap_user_form_user_register_form_alter(&$form, $form_state) {
     $form['ldap_user_fields']['#collapsed'] = FALSE;
   }
 
+  $form['account']['pass']['#states']['optional'] = [
+    ':input[name=ldap_user_association]' => ['value' => LdapConfiguration::$manualAccountConflictLdapAssociate],
+    ':input[name=ldap_user_create_ldap_acct]' => ['checked' => FALSE],
+  ];
+  $form['account']['pass']['#states']['disabled'] = [
+    ':input[name=ldap_user_association]' => ['value' => LdapConfiguration::$manualAccountConflictLdapAssociate],
+    ':input[name=ldap_user_create_ldap_acct]' => ['checked' => FALSE],
+  ];
+
   $form['#validate'][] = 'ldap_user_form_register_form_validate';
   foreach (array_keys($form['actions']) as $action) {
     if (isset($form['actions'][$action]['#type']) && $form['actions'][$action]['#type'] == 'submit') {