diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java
index 35fd75f6f..324a187af 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java
@@ -31,6 +31,7 @@ import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
+import javax.persistence.Transient;
 
 import org.mitre.oauth2.model.ClientDetailsEntity;
 
@@ -47,7 +48,7 @@ public class ApprovedSite {
     private Long id;
     
     // which user made the approval
-	private UserInfo userInfo;
+	private DefaultUserInfo userInfo;
 	
 	// which OAuth2 client is this tied to
 	private ClientDetailsEntity clientDetails;
@@ -98,14 +99,14 @@ public class ApprovedSite {
      */
     @ManyToOne
     @JoinColumn(name="userinfo_id")
-    public UserInfo getUserInfo() {
+    public DefaultUserInfo getUserInfo() {
     	return userInfo;
     }
 
 	/**
      * @param userInfo the userInfo to set
      */
-    public void setUserInfo(UserInfo userInfo) {
+    public void setUserInfo(DefaultUserInfo userInfo) {
     	this.userInfo = userInfo;
     }
 
@@ -192,7 +193,7 @@ public class ApprovedSite {
      * Does this AP entry correspond to a WS?
      * @return
      */
-    @Basic
+    @Transient
 	public Boolean getIsWhitelisted() {
 		return (whitelistedSite != null);
 	}
diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java
index 13af65712..021382451 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java
@@ -50,7 +50,7 @@ public class WhitelistedSite {
     private Long id;
     
     // Reference to the admin user who created this entry
-	private UserInfo creator;
+	private DefaultUserInfo creator;
     
 	// which OAuth2 client is this tied to
 	private ClientDetailsEntity clientDetails;
@@ -115,11 +115,11 @@ public class WhitelistedSite {
 
 	@ManyToOne
 	@JoinColumn(name="userinfo_id")
-	public UserInfo getCreator() {
+	public DefaultUserInfo getCreator() {
 		return creator;
 	}
 
-	public void setCreator(UserInfo creator) {
+	public void setCreator(DefaultUserInfo creator) {
 		this.creator = creator;
 	}
 }
diff --git a/openid-connect-server/src/main/resources/META-INF/persistence.xml b/openid-connect-server/src/main/resources/META-INF/persistence.xml
index 6d22a8773..b4f165fcb 100644
--- a/openid-connect-server/src/main/resources/META-INF/persistence.xml
+++ b/openid-connect-server/src/main/resources/META-INF/persistence.xml
@@ -14,6 +14,7 @@
         <class>org.mitre.openid.connect.model.IdToken</class>
         <class>org.mitre.openid.connect.model.IdTokenClaims</class>
         <class>org.mitre.openid.connect.model.DefaultUserInfo</class>
+<!--         <class>org.mitre.openid.connect.model.UserInfo</class> -->
         <class>org.mitre.openid.connect.model.WhitelistedSite</class>
         <shared-cache-mode>NONE</shared-cache-mode>
     </persistence-unit>