diff --git a/src/models/accounts.nim b/src/models/accounts.nim
index 0bc9ded4a3..e544c97ce5 100644
--- a/src/models/accounts.nim
+++ b/src/models/accounts.nim
@@ -57,7 +57,8 @@ 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_accounts.setupRandomTestAccount()
+  let generatedAccounts = status_accounts.generateAddresses().parseJson
+  discard status_accounts.setupAccount(generatedAccounts[0], "qwerty")
   self.events.emit("accountsReady", Args())
 
 proc storeAccountAndLogin*(self: AccountModel, selectedAccountIndex: int, password: string): string =
diff --git a/src/status/accounts.nim b/src/status/accounts.nim
index 7e6841baad..03c40e559e 100644
--- a/src/status/accounts.nim
+++ b/src/status/accounts.nim
@@ -132,10 +132,3 @@ proc setupAccount*(account: JsonNode, password: string): string =
   var settingsJSON = getAccountSettings(account, alias, identicon, multiAccounts, constants.DEFAULT_NETWORKS)
 
   $saveAccountAndLogin(multiAccounts, alias, identicon, $accountData, password, $constants.NODE_CONFIG, $settingsJSON)
-
-proc setupRandomTestAccount*(): string =
-  let generatedAddresses = generateAddresses().parseJson
-  let account = generatedAddresses[0]
-  let password = "qwerty"
-
-  setupAccount(account, password)