diff --git a/apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js b/apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js
index 310f261e05e..e796b81e0eb 100644
--- a/apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js
+++ b/apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js
@@ -23,6 +23,7 @@ OCA = OCA || {};
 				'ldap_loginfilter_attributes'
 			]);
 			this.setTargetKey('ldap_login_filter');
+			this.runsOnRequest = true;
 
 			this.wizardMethod = 'getUserLoginFilter';
 		}
diff --git a/apps/user_ldap/js/wizard/wizardDetectorFilterUser.js b/apps/user_ldap/js/wizard/wizardDetectorFilterUser.js
index 63dff4e2985..d34e244a1f5 100644
--- a/apps/user_ldap/js/wizard/wizardDetectorFilterUser.js
+++ b/apps/user_ldap/js/wizard/wizardDetectorFilterUser.js
@@ -22,6 +22,7 @@ OCA = OCA || {};
 				'ldap_userfilter_objectclass'
 			]);
 			this.setTargetKey('ldap_userlist_filter');
+			this.runsOnRequest = true;
 
 			this.wizardMethod = 'getUserListFilter';
 		}
diff --git a/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js b/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js
index e2ac55f0719..024b6af65d0 100644
--- a/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js
+++ b/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js
@@ -294,6 +294,11 @@ OCA = OCA || {};
 		onFeatureReceived: function(view, payload) {
 			if(payload.feature === view.getObjectClassItem().featureName) {
 				view.equipMultiSelect(view.getObjectClassItem().$element, payload.data);
+				if(    !view.getFilterItem().$element.val()
+					&& view.parsedFilterMode === view.configModel.FILTER_MODE_ASSISTED
+				) {
+					view.configModel.requestWizard(view.getFilterItem().keyName)
+				}
 			} else if (payload.feature === view.getGroupsItem().featureName) {
 				if(view.manyGroupsSupport && payload.data.length > view._groupElementSwitchThreshold) {
 					// we need to fill the left list box, excluding the values
diff --git a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
index 5e9f0728b0e..9438fd73346 100644
--- a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
+++ b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
@@ -185,6 +185,9 @@ OCA = OCA || {};
 		 */
 		onActivate: function() {
 			this.considerFeatureRequests();
+			if(!this.managedItems.ldap_login_filter.$element.val()) {
+				this.configModel.requestWizard('ldap_login_filter');
+			}
 		},
 
 		/**