diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index 46e2670ac..162d3f089 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -646,12 +646,17 @@ QString Entry::resolvePlaceholder(const QString& str) const
     const QList<QString> keyList = attributes()->keys();
     for (const QString& key : keyList) {
         Qt::CaseSensitivity cs = Qt::CaseInsensitive;
+        QString k = key;
+
         if (!EntryAttributes::isDefaultAttribute(key)) {
             cs = Qt::CaseSensitive;
+            k.prepend("{S:");
+        } else {
+            k.prepend("{");
         }
 
-        QString k = key;
-        k.prepend("{").append("}");
+        
+        k.append("}");
         if (result.compare(k,cs)==0) {
             result.replace(result,attributes()->value(key));
             break;
diff --git a/tests/TestAutoType.cpp b/tests/TestAutoType.cpp
index c5c1a5933..a73298866 100644
--- a/tests/TestAutoType.cpp
+++ b/tests/TestAutoType.cpp
@@ -96,10 +96,10 @@ void TestAutoType::init()
     m_entry4->setPassword("custom_attr");
     m_entry4->attributes()->set("CUSTOM","Attribute",false);
     association.window = "//^CustomAttr1$//";
-    association.sequence = "{PASSWORD}:{CUSTOM}";
+    association.sequence = "{PASSWORD}:{S:CUSTOM}";
     m_entry4->autoTypeAssociations()->add(association);
     association.window = "//^CustomAttr2$//";
-    association.sequence = "{CuStOm}";
+    association.sequence = "{S:CuStOm}";
     m_entry4->autoTypeAssociations()->add(association);
     association.window = "//^CustomAttr3$//";
     association.sequence = "{PaSSworD}";