diff --git a/src/apps/accounts/src/settings/tabs/tools/service-provider/ServiceProvider.tsx b/src/apps/accounts/src/settings/tabs/tools/service-provider/ServiceProvider.tsx
index b5dbbdd6b..4de9e7c0d 100644
--- a/src/apps/accounts/src/settings/tabs/tools/service-provider/ServiceProvider.tsx
+++ b/src/apps/accounts/src/settings/tabs/tools/service-provider/ServiceProvider.tsx
@@ -379,6 +379,7 @@ const ServiceProvider: FC<ServiceProviderProps> = (props: ServiceProviderProps)
                         type='text'
                         error={formErrors.serviceProviderName}
                         dirty
+                        forceUpdateValue
                     />
                     <div className={styles.formCTAs}>
                         {!isEditMode && <IconOutline.PlusCircleIcon />}
diff --git a/src/apps/accounts/src/settings/tabs/tools/software/Software.tsx b/src/apps/accounts/src/settings/tabs/tools/software/Software.tsx
index 044786715..340b48bfd 100644
--- a/src/apps/accounts/src/settings/tabs/tools/software/Software.tsx
+++ b/src/apps/accounts/src/settings/tabs/tools/software/Software.tsx
@@ -313,6 +313,7 @@ const Software: FC<SoftwareProps> = (props: SoftwareProps) => {
                         name='softwareName'
                         label='Software Name *'
                         value={selectedSoftwareName}
+                        forceUpdateValue
                         onChange={handleSoftwareNameChange}
                         placeholder='Type here the Software Name'
                         tabIndex={0}
diff --git a/src/apps/accounts/src/settings/tabs/tools/subscriptions/Subscriptions.tsx b/src/apps/accounts/src/settings/tabs/tools/subscriptions/Subscriptions.tsx
index f41734988..491018f9b 100644
--- a/src/apps/accounts/src/settings/tabs/tools/subscriptions/Subscriptions.tsx
+++ b/src/apps/accounts/src/settings/tabs/tools/subscriptions/Subscriptions.tsx
@@ -297,6 +297,7 @@ const Subscriptions: FC<SubscriptionsProps> = (props: SubscriptionsProps) => {
                         type='text'
                         error={formErrors.subscriptionName}
                         dirty
+                        forceUpdateValue
                     />
                     <div className={styles.formCTAs}>
                         {!isEditMode && <IconOutline.PlusCircleIcon />}
diff --git a/src/libs/ui/lib/components/modals/confirm/ConfirmModal.tsx b/src/libs/ui/lib/components/modals/confirm/ConfirmModal.tsx
index 739a5e913..8ad0c4a9d 100644
--- a/src/libs/ui/lib/components/modals/confirm/ConfirmModal.tsx
+++ b/src/libs/ui/lib/components/modals/confirm/ConfirmModal.tsx
@@ -28,7 +28,7 @@ const ConfirmModal: FC<ConfirmModalProps> = (props: ConfirmModalProps) => {
             props.onClose?.()
         }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [isLoading])
+    }, [isLoading, props.open])
 
     return (
         <BaseModal