diff --git a/src/views/accounts/AccountItem.vue b/src/views/accounts/AccountItem.vue
index 2b9e76d..7b80c13 100644
--- a/src/views/accounts/AccountItem.vue
+++ b/src/views/accounts/AccountItem.vue
@@ -181,6 +181,7 @@ import IStat from '@/models/IStat'
 import ITransaction from '@/models/ITransaction'
 import IUser from '@/models/IUser'
 import { primary, main, findContrastColor, findDarkValue } from '@/utils'
+import couchService from '@/services/CouchService'
 
 @Component({
   components: {
@@ -199,6 +200,8 @@ import { primary, main, findContrastColor, findDarkValue } from '@/utils'
 export default class AccountItem extends BaseAccount {
   @Action
   public setTitle!: any
+  @Action
+  public addAccountId!: any
   public retrieveTransactions: boolean = false
   public transactions: ITransaction[] = []
   public activeTab: string = 'transaction'
@@ -216,6 +219,11 @@ export default class AccountItem extends BaseAccount {
           this.$router.push({ name: 'home' })
           return
         }
+
+        if (this.account.isPublic) {
+          this.addAccountId({ accountId: this.id })
+          couchService.initLive()
+        }
         this.transactions = await transactionService.getAllByAccountId(this.id)
         this.retrieveTransactions = true
         if (document && document.documentElement) {
diff --git a/src/views/accounts/AccountNew.vue b/src/views/accounts/AccountNew.vue
index a6b6704..2356922 100644
--- a/src/views/accounts/AccountNew.vue
+++ b/src/views/accounts/AccountNew.vue
@@ -132,7 +132,6 @@ import accountService from '@/services/AccountService'
 import queueNotifService from '@/services/QueueNotifService'
 import IUser from '@/models/IUser'
 import { slug } from '@/utils'
-import couchService from '@/services/CouchService'
 
 @Component({
   components: {
@@ -143,8 +142,6 @@ import couchService from '@/services/CouchService'
 export default class AccountNew extends Vue {
   @Getter
   public user!: IUser | null
-  @Action
-  public addAccountId!: any
   public name: string = ''
   public currencies: ICurrency[] = currencies
   public mainCurrency: ICurrency = currencies[0]
@@ -231,10 +228,6 @@ export default class AccountNew extends Vue {
       isPublic: this.isPublic
     }
     const response: PouchDB.Core.Response = await accountService.add(newAccount)
-    if (newAccount.isPublic) {
-      this.addAccountId({ accountId: response.id })
-      couchService.initLive()
-    }
     if (response.ok) {
       this.$router.push({ name: 'account', params: { id: response.id } })
     } else {