1 files changed, 11 insertions, 2 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/pvp2/ContactForm.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/pvp2/ContactForm.java
index a2d6d8775..01615a056 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/pvp2/ContactForm.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/pvp2/ContactForm.java
@@ -43,8 +43,17 @@ public class ContactForm {
 	public ContactForm(Contact dbcont) {
 		this.surname = dbcont.getSurName();
 		this.givenname = dbcont.getGivenName();
-		this.mail =dbcont.getMail();
-		this.phone = dbcont.getPhone();
+		
+		if (dbcont.getMail() != null) {
+			this.mail = new ArrayList<String>();
+			this.mail.addAll(dbcont.getMail());
+		}
+
+		if (dbcont.getPhone() != null) {
+			this.phone = new ArrayList<String>();
+			this.phone.addAll(dbcont.getPhone());
+		}
+		
 		this.company = dbcont.getCompany();
 		this.type = dbcont.getType();
 	}