diff --git a/client/src/components/customers/UpdateCustomer.js b/client/src/components/customers/UpdateCustomer.js
index 1d3bce7..ce91804 100644
--- a/client/src/components/customers/UpdateCustomer.js
+++ b/client/src/components/customers/UpdateCustomer.js
@@ -40,6 +40,7 @@ const UpdateCustomer = () => {
   const [searchParams] = useSearchParams();
   const initialTab = searchParams.get('tab');
   const normalizedInitialTab = ['additionalInfo', 'complianceDeadlines'].includes(initialTab) ? 'personalInfo' : initialTab;
+  const showDischargeButton = searchParams.get('fromEdit') === '1';
   const [activeTab, setActiveTab] = useState(normalizedInitialTab || 'personalInfo');
   const [currentCustomer, setCurrentCustomer] = useState(undefined);
   
@@ -1310,13 +1311,6 @@ const UpdateCustomer = () => {
                   )}
                 </div>
               )}
-              {isCustomerActive() && (
-                <div style={{ marginTop: '16px' }}>
-                  <button className="btn btn-warning btn-sm" onClick={openDischargeConfirmModal}>
-                    <BoxArrowRight className="me-2" size={16}></BoxArrowRight>Discharge Customer
-                  </button>
-                </div>
-              )}
               {!isCustomerActive() && (
                 <div style={{ marginTop: '16px' }}>
                   <button className="btn btn-warning btn-sm" onClick={handleReactivate} disabled={isReactivating}>
@@ -1768,6 +1762,13 @@ const UpdateCustomer = () => {
             </Tab>
 
           </Tabs>
+          {isCustomerActive() && showDischargeButton && (
+            <div className="list-func-panel">
+              <button className="btn btn-warning btn-sm" onClick={openDischargeConfirmModal}>
+                <BoxArrowRight className="me-2" size={16}></BoxArrowRight>Discharge Customer
+              </button>
+            </div>
+          )}
         </div>
       </div>
       <Modal show={showDeleteModal} onHide={() => closeDeleteModal()}>
diff --git a/client/src/components/customers/ViewCustomer.js b/client/src/components/customers/ViewCustomer.js
index 324b120..a17dc39 100644
--- a/client/src/components/customers/ViewCustomer.js
+++ b/client/src/components/customers/ViewCustomer.js
@@ -44,7 +44,7 @@ const ViewCustomer = () => {
   }
 
   const goToEdit = (id) => {
-    navigate(`/customers/edit/${id}?tab=${activeTab}`)
+    navigate(`/customers/edit/${id}?tab=${activeTab}&fromEdit=1`)
   }
 
   // Check if customer is active