diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
index 55405a17058..03ab95047e9 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
@@ -226,6 +226,9 @@ public void updateConfigurationTabs() {
 		tabs.clear();
 
 		tabs.addAll(createConfigurationTabs());
+		if (tabs.size() == 0){
+			return;
+		}
 		int i = tabbedPanel.getSelectedTab();
 		if (i < 0 || i > tabs.size()) {
 			i = 0;
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
index 6e0d1b49a61..abeacc1be4a 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
@@ -217,7 +217,7 @@ public Object getDisplayValue(PrismObject<ConnectorType> object) {
                     @Override
                     public String getIdValue(PrismObject<ConnectorType> object, int index) {
                 		if (index < 0){
-                			List<PrismObject<ConnectorType>> connectors = relevantConnectorsModel.getObject();
+                			List<PrismObject<ConnectorType>> connectors = (List<PrismObject<ConnectorType>> ) getConnectorDropDown().getInput().getChoices();
                 			for (PrismObject<ConnectorType> connector : connectors){
                 				if (connector.getOid().equals(selectedConnectorModel.getObject().getOid())){
                 					return Integer.toString(connectors.indexOf(connector));