diff --git a/src/main/java/org/ntlab/citrusserver/repositories/AccountManager.java b/src/main/java/org/ntlab/citrusserver/repositories/AccountManager.java
index 906bee6..71748b8 100644
--- a/src/main/java/org/ntlab/citrusserver/repositories/AccountManager.java
+++ b/src/main/java/org/ntlab/citrusserver/repositories/AccountManager.java
@@ -89,7 +89,9 @@
     public void changeAccountId(String accountId, String newAccountId, String oldPassword, String token) {
         if(accountToken.get(accountId).equals(token)) { //token比較
             if(accounts.get(accountId).getPassword().equals(oldPassword)) { //password比較
-
+                String oldToken = accountToken.get(accountId);
+                accountToken.remove(accountId);
+                accountToken.put(newAccountId, oldToken);
                 accounts.get(accountId).setId(newAccountId);
                 accounts.put(newAccountId, accounts.get(accountId));
                 accounts.remove(accountId);