diff --git a/apps/OpenSign/src/pages/DraftTemplate.js b/apps/OpenSign/src/pages/DraftTemplate.js
index a38991985..7f3365149 100644
--- a/apps/OpenSign/src/pages/DraftTemplate.js
+++ b/apps/OpenSign/src/pages/DraftTemplate.js
@@ -380,8 +380,10 @@ const DraftTemplate = () => {
         );
         const key = randomId();
         const dragTypeValue = item?.text ? item.text : monitor.type;
-        const widgetWidth = defaultWidthHeight(dragTypeValue).width;
-        const widgetHeight = defaultWidthHeight(dragTypeValue).height;
+        const widgetWidth =
+          defaultWidthHeight(dragTypeValue).width * containerScale;
+        const widgetHeight =
+          defaultWidthHeight(dragTypeValue).height * containerScale;
         let dropData = [],
           currentPagePosition;
         let placeHolder;
diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js
index f53de62a0..d678b4834 100644
--- a/apps/OpenSign/src/pages/PdfRequestFiles.js
+++ b/apps/OpenSign/src/pages/PdfRequestFiles.js
@@ -1558,10 +1558,10 @@ function PdfRequestFiles(props) {
   //`handlePublicUser` function to use create user from public role and create document from public template
   const handlePublicUser = async (e) => {
     e.preventDefault();
-    setLoading(true);
     if (!emailRegex.test(contact.email)) {
       alert("Please enter a valid email address.");
     } else {
+      setLoading(true);
       try {
         const params = {
           ...contact,