1 files changed, 8 insertions, 4 deletions
diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java
index ebfa9f2..0f30824 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java
@@ -95,10 +95,14 @@ public class UserFileDAO implements UserDAO {
     @Override
     public User createUser(User user) throws IOException {
         synchronized (users) {
-            User newUser = new User(user);
-            users.put(newUser.getName(), newUser);
-            save();
-            return newUser;
+            if (getUser(user.getName()) != null) {
+                User newUser = new User(user);
+                users.put(newUser.getName(), newUser);
+                save();
+                return newUser;
+            } else {
+                return null;
+            }
         }
     }