diff --git a/apps/OpenSign/src/components/pdf/Placeholder.js b/apps/OpenSign/src/components/pdf/Placeholder.js
index 43d42da80..d426b9982 100644
--- a/apps/OpenSign/src/components/pdf/Placeholder.js
+++ b/apps/OpenSign/src/components/pdf/Placeholder.js
@@ -262,6 +262,10 @@ function Placeholder(props) {
       if (props.pos.key === props.selectWidgetId) {
         props.handleLinkUser(props.data.Id);
         props.setUniqueId(props.data.Id);
+        const checkIndex = props.xyPostion.findIndex(
+          (data) => data.Id === props.data.Id
+        );
+        props.setIsSelectId(checkIndex || 0);
       }
     } else if (!props.pos.type) {
       if (
@@ -321,9 +325,19 @@ function Placeholder(props) {
     if (props.data && props?.pos?.type !== textWidget) {
       props.setSignerObjId(props?.data?.signerObjId);
       props.setUniqueId(props?.data?.Id);
+      const checkIndex = props.xyPostion.findIndex(
+        (data) => data.Id === props.data.Id
+      );
+
+      props.setIsSelectId(checkIndex || 0);
     } else if (props.data && props.pos.type === textWidget) {
       props.setTempSignerId(props.uniqueId);
       props.setUniqueId(props?.data?.Id);
+      const checkIndex = props.xyPostion.findIndex(
+        (data) => data.Id === props.data.Id
+      );
+
+      props.setIsSelectId(checkIndex || 0);
     }
     props.setSignKey(props.pos.key);
     props.setWidgetType(props.pos.type);
@@ -340,10 +354,19 @@ function Placeholder(props) {
     if (props.data && props?.pos?.type !== textWidget) {
       props.setSignerObjId(props?.data?.signerObjId);
       props.setUniqueId(props?.data?.Id);
+      const checkIndex = props.xyPostion.findIndex(
+        (data) => data.Id === props.data.Id
+      );
+
+      props.setIsSelectId(checkIndex || 0);
     } else if (props.data && props.pos.type === textWidget) {
       props.setTempSignerId(props.uniqueId);
       props.setSignerObjId(props?.data?.signerObjId);
       props.setUniqueId(props?.data?.Id);
+      const checkIndex = props.xyPostion.findIndex(
+        (data) => data.Id === props.data.Id
+      );
+      props.setIsSelectId(checkIndex || 0);
     }
 
     //checking widget's type and open widget copy modal for required widgets
@@ -457,11 +480,19 @@ function Placeholder(props) {
                     e.stopPropagation();
                     props.handleLinkUser(props.data.Id);
                     props.setUniqueId(props.data.Id);
+                    const checkIndex = props.xyPostion.findIndex(
+                      (data) => data.Id === props.data.Id
+                    );
+                    props.setIsSelectId(checkIndex || 0);
                   }}
                   onTouchEnd={(e) => {
                     e.stopPropagation();
                     props.handleLinkUser(props.data.Id);
                     props.setUniqueId(props.data.Id);
+                    const checkIndex = props.xyPostion.findIndex(
+                      (data) => data.Id === props.data.Id
+                    );
+                    props.setIsSelectId(checkIndex || 0);
                   }}
                   style={{ color: "#188ae2", right: "32px", top: "-18px" }}
                 ></i>
@@ -483,6 +514,10 @@ function Placeholder(props) {
                 if (props.data) {
                   props.setSignKey(props.pos.key);
                   props.setUniqueId(props.data.Id);
+                  const checkIndex = props.xyPostion.findIndex(
+                    (data) => data.Id === props.data.Id
+                  );
+                  props.setIsSelectId(checkIndex || 0);
                 }
               }}
               onTouchEnd={(e) => {
@@ -491,6 +526,10 @@ function Placeholder(props) {
                 if (props.data) {
                   props.setSignKey(props.pos.key);
                   props.setUniqueId(props.data.Id);
+                  const checkIndex = props.xyPostion.findIndex(
+                    (data) => data.Id === props.data.Id
+                  );
+                  props.setIsSelectId(checkIndex || 0);
                 }
               }}
             >
diff --git a/apps/OpenSign/src/components/pdf/RecipientList.js b/apps/OpenSign/src/components/pdf/RecipientList.js
index b7c3b69d8..926cad468 100644
--- a/apps/OpenSign/src/components/pdf/RecipientList.js
+++ b/apps/OpenSign/src/components/pdf/RecipientList.js
@@ -113,7 +113,7 @@ const RecipientList = (props) => {
               } flex flex-row rounded-xl px-2 py-[10px] mt-1 mx-1 items-center last:mb-0.5`}
               style={{
                 background:
-                  (!isMobile && isHover === ind) || props.isSelectListId === ind
+                  (!isMobile && isHover === ind) || props.uniqueId === obj.Id
                     ? obj?.blockColor
                       ? obj?.blockColor
                       : color[ind % color.length]
diff --git a/apps/OpenSign/src/components/pdf/RenderPdf.js b/apps/OpenSign/src/components/pdf/RenderPdf.js
index abc105da7..c14c31a71 100644
--- a/apps/OpenSign/src/components/pdf/RenderPdf.js
+++ b/apps/OpenSign/src/components/pdf/RenderPdf.js
@@ -57,7 +57,8 @@ function RenderPdf({
   setTempSignerId,
   uniqueId,
   pdfOriginalWH,
-  scale
+  scale,
+  setIsSelectId
 }) {
   const isMobile = window.innerWidth < 767;
   //check isGuestSigner is present in local if yes than handle login flow header in mobile view
@@ -319,6 +320,7 @@ function RenderPdf({
                                         containerWH={containerWH}
                                         pdfOriginalWH={pdfOriginalWH}
                                         pageNumber={pageNumber}
+                                        setIsSelectId={setIsSelectId}
                                       />
                                     </React.Fragment>
                                   );
@@ -428,7 +430,7 @@ function RenderPdf({
         >
           <div
             style={{
-              width: containerWH.width * scale
+              width: containerWH.width && containerWH.width * scale
             }}
             ref={drop}
             id="container"
@@ -501,6 +503,7 @@ function RenderPdf({
                                           containerWH={containerWH}
                                           pdfOriginalWH={pdfOriginalWH}
                                           pageNumber={pageNumber}
+                                          setIsSelectId={setIsSelectId}
                                         />
                                       </React.Fragment>
                                     );
diff --git a/apps/OpenSign/src/components/pdf/WidgetComponent.js b/apps/OpenSign/src/components/pdf/WidgetComponent.js
index 88f9f9818..eb5880297 100644
--- a/apps/OpenSign/src/components/pdf/WidgetComponent.js
+++ b/apps/OpenSign/src/components/pdf/WidgetComponent.js
@@ -38,7 +38,7 @@ function WidgetComponent({
   isTemplateFlow,
   setBlockColor,
   setIsAddSigner,
-  blockColor
+  uniqueId
 }) {
   const [isSignersModal, setIsSignersModal] = useState(false);
   const [, dropdown] = useDrag({
@@ -255,7 +255,6 @@ function WidgetComponent({
       return name;
     }
   };
-
   return (
     <>
       {isMobile ? (
@@ -265,14 +264,13 @@ function WidgetComponent({
               <div className="w-full mb-[5px] flex justify-center items-center gap-1">
                 <div className="w-full ml-[5px]" onClick={() => handleModal()}>
                   <select
+                    data-tut="recipientArea"
                     className="w-full op-select op-select-bordered  pointer-events-none"
                     value={handleSelectRecipient()}
                     style={{
-                      backgroundColor: blockColor
-                        ? blockColor
-                        : isSelectListId
-                          ? color[isSelectListId % color.length]
-                          : color[0]
+                      backgroundColor: isSelectListId
+                        ? color[isSelectListId % color.length]
+                        : color[0]
                     }}
                   >
                     <option value={handleSelectRecipient()}>
@@ -372,6 +370,7 @@ function WidgetComponent({
                 sendInOrder={sendInOrder}
                 setSignersData={setSignersData}
                 setBlockColor={setBlockColor}
+                uniqueId={uniqueId}
               />
             </div>
           ) : (
diff --git a/apps/OpenSign/src/pages/ChangePassword.js b/apps/OpenSign/src/pages/ChangePassword.js
index 41da9ed18..990fd8ed8 100644
--- a/apps/OpenSign/src/pages/ChangePassword.js
+++ b/apps/OpenSign/src/pages/ChangePassword.js
@@ -21,9 +21,10 @@ function ChangePassword() {
                 user.set("password", newpassword);
                 user
                   .save()
-                  .then(() => {
+                  .then(async () => {
                     let _user = user.toJSON();
                     if (_user) {
+                      await Parse.User.become(_user.sessionToken);
                       localStorage.setItem("accesstoken", _user.sessionToken);
                     }
                     alert("Password updated successfully.");
diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js
index baa43fd9a..6b467f358 100644
--- a/apps/OpenSign/src/pages/PlaceHolderSign.js
+++ b/apps/OpenSign/src/pages/PlaceHolderSign.js
@@ -2101,6 +2101,7 @@ function PlaceHolderSign() {
                         pdfOriginalWH={pdfOriginalWH}
                         setScale={setScale}
                         scale={scale}
+                        setIsSelectId={setIsSelectId}
                       />
                     )}
                   </div>
@@ -2144,6 +2145,7 @@ function PlaceHolderSign() {
                         setBlockColor={setBlockColor}
                         setIsAddSigner={setIsAddSigner}
                         handleDeleteUser={handleDeleteUser}
+                        uniqueId={uniqueId}
                       />
                     </div>
                   ) : (
@@ -2170,6 +2172,7 @@ function PlaceHolderSign() {
                           setIsAddSigner={setIsAddSigner}
                           handleDeleteUser={handleDeleteUser}
                           roleName={roleName}
+                          uniqueId={uniqueId}
                           // handleAddSigner={handleAddSigner}
                         />
                         <div data-tut="addWidgets">
diff --git a/apps/OpenSign/src/pages/TemplatePlaceholder.js b/apps/OpenSign/src/pages/TemplatePlaceholder.js
index a307c5a17..55ad4f8df 100644
--- a/apps/OpenSign/src/pages/TemplatePlaceholder.js
+++ b/apps/OpenSign/src/pages/TemplatePlaceholder.js
@@ -616,7 +616,6 @@ const TemplatePlaceholder = () => {
       setIsDragging(false);
     }, 200);
   };
-
   //function for delete signature block
   const handleDeleteSign = (key, Id) => {
     const updateData = [];
@@ -1538,6 +1537,7 @@ const TemplatePlaceholder = () => {
                         pdfOriginalWH={pdfOriginalWH}
                         setScale={setScale}
                         scale={scale}
+                        setIsSelectId={setIsSelectId}
                       />
                     )}
                   </div>
@@ -1610,6 +1610,7 @@ const TemplatePlaceholder = () => {
                       setSignersData={setSignersData}
                       blockColor={blockColor}
                       setBlockColor={setBlockColor}
+                      uniqueId={uniqueId}
                     />
                     <div data-tut="addWidgets">
                       <WidgetComponent