diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/comp/db/UserServiceTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/comp/db/UserServiceTest.java
index 8fd1c8a8d41..e29bbd3476f 100644
--- a/jans-auth-server/server/src/test/java/io/jans/as/server/comp/db/UserServiceTest.java
+++ b/jans-auth-server/server/src/test/java/io/jans/as/server/comp/db/UserServiceTest.java
@@ -297,7 +297,7 @@ public void findUserAfterAddAuthenticator() {
         assertNotNull(user.getAuthenticator());
         assertNotNull(user.getAuthenticator().getAuthenticators());
         assertEquals(user.getAuthenticator().getAuthenticators().size(), 1);
-        assertEquals(userAuthenticatorService.getUserAuthenticatorsByType(user, "type1"), Arrays.asList(new UserAuthenticator("id2", "type2")));
+        assertEquals(userAuthenticatorService.getUserAuthenticatorsByType(user, "type2"), Arrays.asList(new UserAuthenticator("id2", "type2")));
 
     }
 
diff --git a/jans-orm/model/src/main/java/io/jans/orm/model/base/CustomObjectAttribute.java b/jans-orm/model/src/main/java/io/jans/orm/model/base/CustomObjectAttribute.java
index c12ad7e64cb..a95d12eacab 100644
--- a/jans-orm/model/src/main/java/io/jans/orm/model/base/CustomObjectAttribute.java
+++ b/jans-orm/model/src/main/java/io/jans/orm/model/base/CustomObjectAttribute.java
@@ -8,6 +8,7 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -55,7 +56,11 @@ public Object getValue() {
 
     public void setValue(Object value) {
         this.values = new ArrayList<>();
-        this.values.add(value);
+    	if (value instanceof List) {
+            this.values.addAll((Collection<? extends Object>) value);
+    	} else {
+    		this.values.add(value);
+    	}
         this.multiValued = false;
     }