diff --git a/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/UserRepository.java b/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/UserRepository.java
index 4adfd3dd1..cf9ce118c 100644
--- a/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/UserRepository.java
+++ b/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/UserRepository.java
@@ -236,6 +236,12 @@ public User createOpenAccessUser(Role openAccessRole) {
      * @param user the user to save
      */
     public void save(User user) {
-        em().merge(user);
+        // if user exists update, else create
+        if (user.getUuid() != null) {
+            em().merge(user);
+        } else {
+            em().persist(user);
+        }
     }
+
 }