diff --git a/src/main/java/org/ntlab/amaryllis/server/entities/Account.java b/src/main/java/org/ntlab/amaryllis/server/entities/Account.java
index c5d5fff..424e4e9 100644
--- a/src/main/java/org/ntlab/amaryllis/server/entities/Account.java
+++ b/src/main/java/org/ntlab/amaryllis/server/entities/Account.java
@@ -1,6 +1,7 @@
 package org.ntlab.amaryllis.server.entities;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.ntlab.amaryllis.server.models.Accounts;
 
 import java.util.ArrayList;
 import java.util.UUID;
@@ -30,6 +31,8 @@
     }
 
     public void setUid(String uid) {
+        Accounts.getInstance().getMap().remove(getUid());
+        Accounts.getInstance().getMap().put(uid,this);
         this.uid = uid;
     }