diff --git a/apps/user_ldap/js/wizard/view.js b/apps/user_ldap/js/wizard/view.js
index 96f700f8f1a2353d6d29c4cd095c13c3399fdc69..7743c277d61bab72668a43a4e35602f2c3ebe90b 100644
--- a/apps/user_ldap/js/wizard/view.js
+++ b/apps/user_ldap/js/wizard/view.js
@@ -225,6 +225,10 @@ OCA = OCA || {};
 			} else {
 				console.warn('Unreferenced left tab ' + oldTabID);
 			}
+
+			if(!_.isUndefined(this.tabs[newTabID])) {
+				this._controlUpdate(this.tabs[newTabID].tabIndex);
+			}
 		},
 
 		/**
diff --git a/apps/user_ldap/js/wizard/wizard.js b/apps/user_ldap/js/wizard/wizard.js
index faa9de918a4e65060bf0e86e17ff7433dcfa7671..e8450d1c78fc17992487023f507ed43f7db04524 100644
--- a/apps/user_ldap/js/wizard/wizard.js
+++ b/apps/user_ldap/js/wizard/wizard.js
@@ -52,9 +52,9 @@ OCA = OCA || {};
 		var filterOnTypeFactory = new OCA.LDAP.Wizard.FilterOnTypeFactory();
 
 		var tabs = [];
-		tabs.push(new OCA.LDAP.Wizard.WizardTabUserFilter(filterOnTypeFactory));
-		tabs.push(new OCA.LDAP.Wizard.WizardTabLoginFilter());
-		tabs.push(new OCA.LDAP.Wizard.WizardTabGroupFilter(filterOnTypeFactory));
+		tabs.push(new OCA.LDAP.Wizard.WizardTabUserFilter(filterOnTypeFactory, 1));
+		tabs.push(new OCA.LDAP.Wizard.WizardTabLoginFilter(2));
+		tabs.push(new OCA.LDAP.Wizard.WizardTabGroupFilter(filterOnTypeFactory, 3));
 		tabs.push(new OCA.LDAP.Wizard.WizardTabAdvanced());
 		tabs.push(new OCA.LDAP.Wizard.WizardTabExpert());
 
diff --git a/apps/user_ldap/js/wizard/wizardTabElementary.js b/apps/user_ldap/js/wizard/wizardTabElementary.js
index 31318dd0b2ed479394dadd9adadd1d5e26186662..f4a966328c1eeabc8b4160be032396cb129e2d8f 100644
--- a/apps/user_ldap/js/wizard/wizardTabElementary.js
+++ b/apps/user_ldap/js/wizard/wizardTabElementary.js
@@ -21,6 +21,7 @@ OCA = OCA || {};
 		 * @param tabID
 		 */
 		init: function (tabIndex, tabID) {
+			tabIndex = 0;
 			this._super(tabIndex, tabID);
 			this.isActive = true;
 			this.configChooserID = '#ldap_serverconfig_chooser';