diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
index 834d76acad..a1ea5d6849 100644
--- a/src/browser/BrowserService.cpp
+++ b/src/browser/BrowserService.cpp
@@ -371,6 +371,17 @@ void BrowserService::updateEntry(const QString& id,
         return;
     }
 
+    // Check if the entry password is a reference. If so, update the original entry instead
+    while (entry->attributes()->isReference(EntryAttributes::PasswordKey)) {
+        const QUuid referenceUuid = entry->attributes()->referenceUuid(EntryAttributes::PasswordKey);
+        if (!referenceUuid.isNull()) {
+            entry = db->rootGroup()->findEntryByUuid(referenceUuid);
+            if (!entry) {
+                return;
+            }
+        }
+    }
+
     QString username = entry->username();
     if (username.isEmpty()) {
         return;
@@ -391,7 +402,9 @@ void BrowserService::updateEntry(const QString& id,
 
         if (browserSettings()->alwaysAllowUpdate() || dialogResult == MessageBox::Save) {
             entry->beginUpdate();
-            entry->setUsername(login);
+            if (!entry->attributes()->isReference(EntryAttributes::UserNameKey)) {
+                entry->setUsername(login);
+            }
             entry->setPassword(password);
             entry->endUpdate();
         }
diff --git a/src/core/EntryAttributes.cpp b/src/core/EntryAttributes.cpp
index fc0793ce83..5c836e1e8a 100644
--- a/src/core/EntryAttributes.cpp
+++ b/src/core/EntryAttributes.cpp
@@ -244,6 +244,24 @@ void EntryAttributes::copyDataFrom(const EntryAttributes* other)
     }
 }
 
+QUuid EntryAttributes::referenceUuid(const QString& key) const
+{
+    if (!m_attributes.contains(key)) {
+        Q_ASSERT(false);
+        return {};
+    }
+
+    auto match = matchReference(value(key));
+    if (match.hasMatch()) {
+        const QString uuid = match.captured("SearchText");
+        if (!uuid.isEmpty()) {
+            return QUuid::fromRfc4122(QByteArray::fromHex(uuid.toLatin1()));
+        }
+    }
+
+    return {};
+}
+
 bool EntryAttributes::operator==(const EntryAttributes& other) const
 {
     return (m_attributes == other.m_attributes && m_protectedAttributes == other.m_protectedAttributes);
diff --git a/src/core/EntryAttributes.h b/src/core/EntryAttributes.h
index 15c84bdcdc..fdae8a6240 100644
--- a/src/core/EntryAttributes.h
+++ b/src/core/EntryAttributes.h
@@ -24,6 +24,7 @@
 #include <QRegularExpression>
 #include <QSet>
 #include <QStringList>
+#include <QUuid>
 
 class EntryAttributes : public QObject
 {
@@ -47,6 +48,7 @@ class EntryAttributes : public QObject
     void clear();
     int attributesSize() const;
     void copyDataFrom(const EntryAttributes* other);
+    QUuid referenceUuid(const QString& key) const;
     bool operator==(const EntryAttributes& other) const;
     bool operator!=(const EntryAttributes& other) const;
 
diff --git a/tests/TestEntry.cpp b/tests/TestEntry.cpp
index 23af41e6af..c174e798df 100644
--- a/tests/TestEntry.cpp
+++ b/tests/TestEntry.cpp
@@ -140,6 +140,7 @@ void TestEntry::testClone()
     QCOMPARE(entryClonePassRef->timeInfo().creationTime(), entryOrgClone->timeInfo().creationTime());
     QVERIFY(entryClonePassRef->attributes()->isReference(EntryAttributes::PasswordKey));
     QCOMPARE(entryClonePassRef->resolvePlaceholder(entryCloneUserRef->password()), entryOrg->password());
+    QCOMPARE(entryClonePassRef->attributes()->referenceUuid(EntryAttributes::PasswordKey), entryOrgClone->uuid());
 }
 
 void TestEntry::testResolveUrl()