diff --git a/EnvelopeGenerator.Web/wwwroot/js/annotation.js b/EnvelopeGenerator.Web/wwwroot/js/annotation.js
index d266917b..c5383052 100644
--- a/EnvelopeGenerator.Web/wwwroot/js/annotation.js
+++ b/EnvelopeGenerator.Web/wwwroot/js/annotation.js
@@ -328,9 +328,16 @@ function mapSignature(iJSON) {
             const preElement = findNearest(annot, e => e.bbox[0], e => e.bbox[1], ...iJSON.annotations.filter(field => field.id.includes("signature")));
             const idPartsOfPre = preElement.id.split('#');
             annot.elementId = Number(idPartsOfPre[2]);
-            annot.name = annot.description.toLowerCase();
+            annot.name = 'frame';
             annot.value = fixBase64(iJSON.attachments[annot.imageAttachmentId]?.binary);
             return annot;
+        }),
+        signatures: iJSON.annotations.filter(annot => annot.isSignature).map(annot => {
+            if (annot.imageAttachmentId)
+                annot.value = iJSON.attachments[annot.imageAttachmentId]?.binary;
+
+            annot.name = 'signature';
+            return annot;
         })
     };
 }
\ No newline at end of file