diff --git a/mail-vue/src/init/init.js b/mail-vue/src/init/init.js
index 3d0bc10..79e6b78 100644
--- a/mail-vue/src/init/init.js
+++ b/mail-vue/src/init/init.js
@@ -38,7 +38,8 @@ export async function init() {
         document.title = setting.title;
 
         if (user) {
-            accountStore.currentAccountId = user.accountId;
+            accountStore.currentAccountId = user.account.accountId;
+            accountStore.currentAccount = user.account;
             userStore.user = user;
 
             const routers = permsToRouter(user.permKeys);
diff --git a/mail-vue/src/views/login/index.vue b/mail-vue/src/views/login/index.vue
index b7fc4dd..6c3ecbe 100644
--- a/mail-vue/src/views/login/index.vue
+++ b/mail-vue/src/views/login/index.vue
@@ -390,10 +390,10 @@ const submit = () => {
 }
 
 async function saveToken(token) {
-  console.log(token)
   localStorage.setItem('token', token)
   const user = await loginUserInfo();
-  accountStore.currentAccountId = user.accountId;
+  accountStore.currentAccountId = user.account.accountId;
+  accountStore.currentAccount = user.account;
   userStore.user = user;
   const routers = permsToRouter(user.permKeys);
   routers.forEach(routerData => {
diff --git a/mail-worker/src/service/user-service.js b/mail-worker/src/service/user-service.js
index 2d7468b..bb14a98 100644
--- a/mail-worker/src/service/user-service.js
+++ b/mail-worker/src/service/user-service.js
@@ -35,7 +35,7 @@ const userService = {
 		user.userId = userRow.userId;
 		user.sendCount = userRow.sendCount;
 		user.email = userRow.email;
-		user.accountId = account.accountId;
+		user.account = account;
 		user.name = account.name;
 		user.permKeys = permKeys;
 		user.role = roleRow