diff --git a/src/app/onboarding/core.nim b/src/app/onboarding/core.nim
index 35eced3306..a81230f1d0 100644
--- a/src/app/onboarding/core.nim
+++ b/src/app/onboarding/core.nim
@@ -20,9 +20,11 @@ type OnboardingController* = ref object of SignalSubscriber
 proc newController*(events: EventEmitter): OnboardingController =
   result = OnboardingController()
   # TODO: events should be specific to the model itself
-  result.model = newAccountModel(events)
+  result.model = newAccountModel()
   result.view = newOnboardingView(result.model)
   result.variant = newQVariant(result.view)
+  result.model.events.on("accountsReady") do(a: Args):
+    events.emit("node:ready", Args())
 
 proc delete*(self: OnboardingController) =
   delete self.view
diff --git a/src/models/accounts.nim b/src/models/accounts.nim
index 5917ea56ad..0e11b364f5 100644
--- a/src/models/accounts.nim
+++ b/src/models/accounts.nim
@@ -30,9 +30,9 @@ type
     generatedAddresses*: seq[GeneratedAccount]
     events*: EventEmitter
 
-proc newAccountModel*(events: EventEmitter): AccountModel =
+proc newAccountModel*(): AccountModel =
   result = AccountModel()
-  result.events = events
+  result.events = createEventEmitter()
   result.generatedAddresses = @[]
 
 proc delete*(self: AccountModel) =
@@ -65,7 +65,7 @@ proc generateAddresses*(self: AccountModel): seq[GeneratedAccount] =
 # TODO: this is temporary and will be removed once accounts import and creation is working
 proc generateRandomAccountAndLogin*(self: AccountModel) =
   discard status_test.setupNewAccount()
-  self.events.emit("node:ready", Args())
+  self.events.emit("accountsReady", Args())
 
 proc storeAccountAndLogin*(self: AccountModel, selectedAccountIndex: int, password: string): string =
   # let account = to(json.parseJson(selectedAccount), Models.GeneratedAccount)
@@ -146,5 +146,5 @@ proc storeAccountAndLogin*(self: AccountModel, selectedAccountIndex: int, passwo
   let saveResult = result.parseJson
 
   if saveResult["error"].getStr == "":
-    self.events.emit("node:ready", Args())
+    self.events.emit("accountsReady", Args())
     echo "Account saved succesfully"