diff --git a/src/app/commoncomponents/UsernameTextEdit.qml b/src/app/commoncomponents/UsernameTextEdit.qml
index 94ddea28488b32372c791a54630490b2edd8d5ec..9e34aeacb9ebf14910ebd1980ab29b929b961586 100644
--- a/src/app/commoncomponents/UsernameTextEdit.qml
+++ b/src/app/commoncomponents/UsernameTextEdit.qml
@@ -51,6 +51,7 @@ ModalTextEdit {
 
     property bool isActive: false
     property string infohash: CurrentAccount.uri
+    property string accountId: CurrentAccount.id
     property string registeredName: CurrentAccount.registeredName
     staticText: root.isActive ? registeredName : (registeredName ? registeredName : infohash)
 
@@ -118,7 +119,7 @@ ModalTextEdit {
         onTriggered: {
             if (dynamicText.length !== 0) {
                 nameRegistrationState = UsernameTextEdit.NameRegistrationState.SEARCHING;
-                NameDirectory.lookupName(CurrentAccount.id, dynamicText);
+                NameDirectory.lookupName(root.accountId, dynamicText);
             } else {
                 nameRegistrationState = UsernameTextEdit.NameRegistrationState.BLANK;
             }
diff --git a/src/app/wizardview/components/CreateAccountPage.qml b/src/app/wizardview/components/CreateAccountPage.qml
index 6e14875dc182a63ad10d786c1e3cef1d3b74e002..7334eff0908760b62dbe104687011806bf1114ba 100644
--- a/src/app/wizardview/components/CreateAccountPage.qml
+++ b/src/app/wizardview/components/CreateAccountPage.qml
@@ -133,6 +133,7 @@ Rectangle {
 
                 UsernameTextEdit {
                     id: usernameEdit
+                    accountId: ""
 
                     icon: PushButton {
                         id: infoBox