diff --git a/tests/src/components/contact/ContactModel.cpp b/tests/src/components/contact/ContactModel.cpp
index 3485777a1..aa5fc3531 100644
--- a/tests/src/components/contact/ContactModel.cpp
+++ b/tests/src/components/contact/ContactModel.cpp
@@ -11,11 +11,12 @@ using namespace std;
 const char *ContactModel::NAME = "contact-model";
 
 ContactModel::ContactModel (shared_ptr<linphone::Friend> linphone_friend) {
-  linphone_friend->setData(NAME, *this);
   m_linphone_friend = linphone_friend;
+  m_linphone_friend->setData(NAME, *this);
   m_vcard = make_shared<VcardModel>(linphone_friend->getVcard());
 
   App::getInstance()->getEngine()->setObjectOwnership(m_vcard.get(), QQmlEngine::CppOwnership);
+  QObject::connect(m_vcard.get(), &VcardModel::vcardUpdated, this, &ContactModel::contactUpdated);
 }
 
 ContactModel::ContactModel (VcardModel *vcard) {
@@ -28,6 +29,7 @@ ContactModel::ContactModel (VcardModel *vcard) {
   m_vcard.reset(vcard);
 
   engine->setObjectOwnership(vcard, QQmlEngine::CppOwnership);
+  QObject::connect(vcard, &VcardModel::vcardUpdated, this, &ContactModel::contactUpdated);
 }
 
 Presence::PresenceStatus ContactModel::getPresenceStatus () const {
diff --git a/tests/src/components/contact/ContactModel.hpp b/tests/src/components/contact/ContactModel.hpp
index 9ce99789e..2700026d8 100644
--- a/tests/src/components/contact/ContactModel.hpp
+++ b/tests/src/components/contact/ContactModel.hpp
@@ -23,6 +23,7 @@ class ContactModel : public QObject {
 public:
   ContactModel (std::shared_ptr<linphone::Friend> linphone_friend);
   ContactModel (VcardModel *vcard);
+  ~ContactModel () = default;
 
   static const char *NAME;
 
diff --git a/tests/ui/views/App/MainWindow/ContactEdit.qml b/tests/ui/views/App/MainWindow/ContactEdit.qml
index 17028c3d2..2f7e25a23 100644
--- a/tests/ui/views/App/MainWindow/ContactEdit.qml
+++ b/tests/ui/views/App/MainWindow/ContactEdit.qml
@@ -323,6 +323,10 @@ ColumnLayout  {
         color: ContactEditStyle.values.separator.color
       }
 
+      // -----------------------------------------------------------------------
+      // Edition buttons.
+      // -----------------------------------------------------------------------
+
       Row {
         Layout.alignment: Qt.AlignHCenter
         Layout.topMargin: ContactEditStyle.buttons.topMargin