diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.java
index d162d74bc91..b594aca5f4e 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.java
@@ -94,7 +94,13 @@ public C convertToObject(String value, Locale arg1) throws ConversionException {
                             }
                         }
 
-                        if (strict) {
+                        boolean differentValue = true;
+                        if (getBaseFormComponent() != null && getBaseFormComponent().getModelObject() != null
+                                && getBaseFormComponent().getModelObject().equals(value)) {
+                            differentValue = false;
+                        }
+
+                        if (differentValue && strict) {
                             throw new ConversionException("Cannot convert " + value);
                         }
 
@@ -194,4 +200,3 @@ protected void updateFeedbackPanel(AutoCompleteTextField input, boolean isError,
 
 
 }
-