diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index 05f24b5a1..65e2454e2 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -838,6 +838,8 @@ QString Entry::referenceFieldValue(EntryReferenceType referenceType) const
         return url();
     case EntryReferenceType::Notes:
         return notes();
+    case EntryReferenceType::Uuid:
+        return uuid().toHex();
     default:
         break;
     }
diff --git a/src/core/EntryAttributes.cpp b/src/core/EntryAttributes.cpp
index b1b4fad6a..21dcccf6e 100644
--- a/src/core/EntryAttributes.cpp
+++ b/src/core/EntryAttributes.cpp
@@ -34,7 +34,7 @@ const QString EntryAttributes::RememberCmdExecAttr = "_EXEC_CMD";
 
 EntryAttributes::EntryAttributes(QObject* parent)
     : QObject(parent)
-    , m_referenceRegExp("\\{REF:(?<WantedField>[TUPAN])@(?<SearchIn>[TUPANIO]):(?<SearchText>[^}]+)\\}",
+    , m_referenceRegExp("\\{REF:(?<WantedField>[TUPANI])@(?<SearchIn>[TUPANIO]):(?<SearchText>[^}]+)\\}",
                         QRegularExpression::CaseInsensitiveOption)
 {
     clear();