diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_0.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_0.java
index 2d6f98efe..6cd781e5f 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_0.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_0.java
@@ -18,6 +18,7 @@
  */
 package org.mitre.openid.connect.service.impl;
 
+import com.google.common.collect.Sets;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
@@ -675,7 +676,8 @@ public class MITREidDataService_1_0 extends MITREidDataService_1_X {
                         } else if (name.equals("initiateLoginUri")) {
                             client.setInitiateLoginUri(reader.nextString());
                         } else if (name.equals("postLogoutRedirectUri")) {
-                            client.setPostLogoutRedirectUri(reader.nextString());
+                            HashSet<String> postLogoutUris = Sets.newHashSet(reader.nextString());
+							client.setPostLogoutRedirectUris(postLogoutUris);
                         } else if (name.equals("requestUris")) {
                             Set<String> requestUris = readSet(reader);
                             client.setRequestUris(requestUris);
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_1.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_1.java
index 93f3bc1e2..be95724bb 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_1.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_1.java
@@ -62,6 +62,7 @@ import org.springframework.security.oauth2.provider.OAuth2Authentication;
 import org.springframework.security.oauth2.provider.OAuth2Request;
 import org.springframework.stereotype.Service;
 
+import com.google.common.collect.Sets;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
@@ -687,7 +688,8 @@ public class MITREidDataService_1_1 extends MITREidDataService_1_X {
                         } else if (name.equals("initiateLoginUri")) {
                             client.setInitiateLoginUri(reader.nextString());
                         } else if (name.equals("postLogoutRedirectUri")) {
-                            client.setPostLogoutRedirectUri(reader.nextString());
+                            HashSet<String> postLogoutUris = Sets.newHashSet(reader.nextString());
+							client.setPostLogoutRedirectUris(postLogoutUris);
                         } else if (name.equals("requestUris")) {
                             Set<String> requestUris = readSet(reader);
                             client.setRequestUris(requestUris);
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_2.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_2.java
index 25d4e6363..d51ab4d31 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_2.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_2.java
@@ -62,6 +62,7 @@ import org.springframework.security.oauth2.provider.OAuth2Authentication;
 import org.springframework.security.oauth2.provider.OAuth2Request;
 import org.springframework.stereotype.Service;
 
+import com.google.common.collect.Sets;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
@@ -398,7 +399,8 @@ public class MITREidDataService_1_2 extends MITREidDataService_1_X {
                 writer.name("defaultACRValues");
                 writeNullSafeArray(writer, client.getDefaultACRvalues());
                 writer.name("intitateLoginUri").value(client.getInitiateLoginUri());
-                writer.name("postLogoutRedirectUri").value(client.getPostLogoutRedirectUris());
+                writer.name("postLogoutRedirectUri");
+                writeNullSafeArray(writer, client.getPostLogoutRedirectUris());
                 writer.name("requestUris");
                 writeNullSafeArray(writer, client.getRequestUris());
                 writer.name("description").value(client.getClientDescription());
@@ -1022,7 +1024,8 @@ public class MITREidDataService_1_2 extends MITREidDataService_1_X {
                         } else if (name.equals("initiateLoginUri")) {
                             client.setInitiateLoginUri(reader.nextString());
                         } else if (name.equals("postLogoutRedirectUri")) {
-                            client.setPostLogoutRedirectUris(reader.nextString());
+                            HashSet<String> postLogoutUris = Sets.newHashSet(reader.nextString());
+							client.setPostLogoutRedirectUris(postLogoutUris);
                         } else if (name.equals("requestUris")) {
                             Set<String> requestUris = readSet(reader);
                             client.setRequestUris(requestUris);