diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 4c2f182dad..aeb4b9bff5 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -172,7 +172,7 @@ var LdapWizard = {
 		pwd		= $('#ldap_agent_password').val();
 		base	= $('#ldap_base').val();
 
-		if(host && port && agent && pwd && base) {
+		if((host && port  && base) && ((!agent && !pwd) || (agent && pwd))) {
 			$('.ldap_action_continue').removeAttr('disabled');
 			$('#ldapSettings').tabs('option', 'disabled', []);
 		} else {