diff --git a/src/components/loan_screen/PayloanScreens.jsx b/src/components/loan_screen/PayloanScreens.jsx
index b3c483c..38fa2a7 100644
--- a/src/components/loan_screen/PayloanScreens.jsx
+++ b/src/components/loan_screen/PayloanScreens.jsx
@@ -15,7 +15,11 @@ export default function PayloanScreens({step, screens, typeToShow, setShowType,
         {/* <GetLoan step={step} handleStep={handleStep} screens={screens} typeToShow={typeToShow} setShowType={setShowType} /> */}
         <PinRepayment step={step} handleStep={handleStep} screens={screens} />
       </>
-      : null
+      : step?.screen[step.screen.length -1 ] == screens.finished ?
+      <>
+        <PinRepayment step={step} handleStep={handleStep} screens={screens} />
+      </>
+      :null
     }
   </>
   )
diff --git a/src/components/loan_screen/payloan/PinRepayment.jsx b/src/components/loan_screen/payloan/PinRepayment.jsx
index 48eea33..2609a43 100644
--- a/src/components/loan_screen/payloan/PinRepayment.jsx
+++ b/src/components/loan_screen/payloan/PinRepayment.jsx
@@ -37,7 +37,7 @@ export default function PinRepayment({step, handleStep, screens}) {
         },
         onSuccess: (res) => {
             setIsSuccess(true)
-            // handleStep({...step}, screens.finished)
+            handleStep({...step}, screens.finished)
         }
     })