diff --git a/EnvelopeGenerator.Web/wwwroot/js/annotation.js b/EnvelopeGenerator.Web/wwwroot/js/annotation.js
index 02330ed7..88071003 100644
--- a/EnvelopeGenerator.Web/wwwroot/js/annotation.js
+++ b/EnvelopeGenerator.Web/wwwroot/js/annotation.js
@@ -51,27 +51,9 @@
         const top = Annotation.inchToPoint(element.top) - height / 2
         const left = Annotation.inchToPoint(element.left) - width / 2
         const page = element.page - 1
-        const annotation = Annotation.createSignatureAnnotation(
-            id,
-            width,
-            height,
-            top,
-            left,
-            page
-        )
-
-        const formField = new PSPDFKit.FormFields.SignatureFormField({
-            name: id,
-            annotationIds: PSPDFKit.Immutable.List([annotation.id]),
-        })
-
-        return [annotation, formField]
-    }
-
-    static createSignatureAnnotation(id, width, height, top, left, pageIndex) {
         const annotation = new PSPDFKit.Annotations.WidgetAnnotation({
             id: id,
-            pageIndex: pageIndex,
+            pageIndex: page,
             formFieldName: id,
             backgroundColor: PSPDFKit.Color.YELLOW,
             blendMode: 'multiply',
@@ -83,7 +65,12 @@
             }),
         })
 
-        return annotation
+        const formField = new PSPDFKit.FormFields.SignatureFormField({
+            name: id,
+            annotationIds: PSPDFKit.Immutable.List([annotation.id]),
+        })
+
+        return [annotation, formField]
     }
 
     static createImageAnnotation(boundingBox, pageIndex, imageAttachmentId) {