diff --git a/programs/light_client/qml/AccountPicker.qml b/programs/light_client/qml/AccountPicker.qml
index 19c0e758..f789eefe 100644
--- a/programs/light_client/qml/AccountPicker.qml
+++ b/programs/light_client/qml/AccountPicker.qml
@@ -20,7 +20,7 @@ RowLayout {
    }
 
    Identicon {
-      name: accountNameField.text
+      name: account && account.name == accountNameField.text? accountNameField.text : ""
       width: Scaling.cm(2)
       height: Scaling.cm(2)
    }