diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2ClientRepository.java b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2ClientRepository.java
index 6ffc3490f..113f6fca1 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2ClientRepository.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2ClientRepository.java
@@ -83,6 +83,9 @@ public class JpaOAuth2ClientRepository implements OAuth2ClientRepository {
 
 	@Override
     public ClientDetailsEntity updateClient(Long id, ClientDetailsEntity client) {
+		// sanity check
+		client.setId(id);
+		
 	    return JpaUtil.saveOrUpdate(id, manager, client);
     }
 
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaWhitelistedSiteRepository.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaWhitelistedSiteRepository.java
index 455f46f90..db32154ec 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaWhitelistedSiteRepository.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaWhitelistedSiteRepository.java
@@ -75,6 +75,9 @@ public class JpaWhitelistedSiteRepository implements WhitelistedSiteRepository {
 	@Override
 	@Transactional
 	public WhitelistedSite update(WhitelistedSite oldWhitelistedSite, WhitelistedSite whitelistedSite) {
+		// sanity check
+		whitelistedSite.setId(oldWhitelistedSite.getId());
+		
 		return saveOrUpdate(oldWhitelistedSite.getId(), manager, whitelistedSite);
 	}