diff --git a/ui/imports/shared/controls/AddressInput.qml b/ui/imports/shared/controls/AddressInput.qml
index 1f0244eb5c..d619987b6e 100644
--- a/ui/imports/shared/controls/AddressInput.qml
+++ b/ui/imports/shared/controls/AddressInput.qml
@@ -55,9 +55,8 @@ Item {
 
         contactsStore: root.contactsStore
 
-        onUserClicked: function (pubKey, isContact) {
-            console.warning("This is not refactored yet. We need to figure out where to get the address from")
-            //chatKey.text = address
+        onUserClicked: function (isContact, pubKey, ensName, address) {
+            chatKey.text = address
         }
         searchResultsWidth: parentWidth
         chatKey.customHeight: 56
diff --git a/ui/imports/shared/controls/ContactsListAndSearch.qml b/ui/imports/shared/controls/ContactsListAndSearch.qml
index d51beffb85..2e99c2c369 100644
--- a/ui/imports/shared/controls/ContactsListAndSearch.qml
+++ b/ui/imports/shared/controls/ContactsListAndSearch.qml
@@ -33,7 +33,7 @@ Item {
     property bool showCheckbox: false
     property bool showContactList: true
     property bool showSearch: true
-    signal userClicked(string pubKey, bool isAddedContact, string name)
+    signal userClicked(string pubKey, bool isAddedContact, string name, string address)
     property var pubKeys: ([])
     property bool hideCommunityMembers: false
     property bool addContactEnabled: true
@@ -198,7 +198,7 @@ Item {
             }
             root.pubKeys = pubKeysCopy
 
-            userClicked(contact.pubKey, contact.isContact, contact.name)
+            userClicked(contact.pubKey, contact.isContact, contact.name, contact.address)
         }
         expanded: !searchResults.loading && pubKey === "" && !searchResults.showProfileNotFoundMessage
     }
@@ -216,7 +216,7 @@ Item {
             if (!validate()) {
                 return
             }
-            userClicked(pubKey, isAddedContact, username)
+            userClicked(pubKey, isAddedContact, username, searchResults.address)
         }
         onAddToContactsButtonClicked: {
             root.contactsStore.addContact(pubKey)