diff --git a/src/pages/Organization/DetailPage/OrganizationCard.js b/src/pages/Organization/DetailPage/OrganizationCard.js
index 4b92881..94ff845 100644
--- a/src/pages/Organization/DetailPage/OrganizationCard.js
+++ b/src/pages/Organization/DetailPage/OrganizationCard.js
@@ -249,7 +249,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                                 color="error"
                                                 onClick={() => setNonCreditorConfirmPopUp(true)}
                                             >
-                                                Mark as Non-Creditor
+                                                Mark as Non-Credit Client
                                             </Button>
                                             </ThemeProvider>
                                         </Grid>
@@ -261,7 +261,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                                     color="orange"
                                                     onClick={() => setCreditorConfirmPopUp(true)}
                                                 >
-                                                    Mark as Creditor
+                                                    Mark as Credit Client
                                                 </Button>
                                             </ThemeProvider>
                                         </Grid>
@@ -300,7 +300,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                         <Grid item lg={4} >
                             <FormControlLabel
                                 control={<Checkbox checked={formik.values.creditor} />}
-                                label="is Creditor"
+                                label="is Credit Client"
                                 name="creditor"
                                 onChange={() => {
                                     formik.setFieldValue("creditor", !formik.values.creditor);
@@ -423,7 +423,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                 >
                     <DialogTitle><Typography variant="h3">Confirm</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
-                        <Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Creditor?</Typography>
+                        <Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Credit Client?</Typography>
                     </DialogContent>
                     <DialogActions>
                         <Button onClick={() => setCreditorConfirmPopUp(false)}><Typography variant="h5">Cancel</Typography></Button>
@@ -445,7 +445,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                 >
                     <DialogTitle><Typography variant="h3">Confirm</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
-                        <Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Non-Creditor?</Typography>
+                        <Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Non-Credit Client?</Typography>
                     </DialogContent>
                     <DialogActions>
                         <Button onClick={() => setNonCreditorConfirmPopUp(false)}><Typography variant="h5">Cancel</Typography></Button>
diff --git a/src/pages/Organization/DetailPage/OrganizationPubCard.js b/src/pages/Organization/DetailPage/OrganizationPubCard.js
index 3487a05..bded0dd 100644
--- a/src/pages/Organization/DetailPage/OrganizationPubCard.js
+++ b/src/pages/Organization/DetailPage/OrganizationPubCard.js
@@ -224,16 +224,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                     disabled: true,
                                     form: formik
                             })}
-                            {/* <FormControlLabel
-                                control={<Checkbox checked={formik.values.creditor} />}
-                                label="is Creditor"
-                                name="creditor"
-                                onChange={() => {
-                                    formik.setFieldValue("creditor", !formik.values.creditor);
-                                }}
-                                disabled={true}
-                            //disabled={!editMode && !createMode}
-                            /> */}
+                          
                         </Grid>
 
                         <Grid item lg={4} ></Grid>
@@ -349,7 +340,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                 >
                     <DialogTitle><Typography variant="h3">Confirm</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
-                        <Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Creditor?</Typography>
+                        <Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Credit Client?</Typography>
                     </DialogContent>
                     <DialogActions>
                     <Button onClick={() => setCreditorConfirmPopUp(false)}><Typography variant="h5">Cancel</Typography></Button>
@@ -371,7 +362,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                 >
                     <DialogTitle><Typography variant="h3">Confirm</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
-                        <Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Non-Creditor?</Typography>
+                        <Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Non-Credit Client?</Typography>
                     </DialogContent>
                     <DialogActions>
                     <Button onClick={() => setNonCreditorConfirmPopUp(false)}><Typography variant="h5">Cancel</Typography></Button>
diff --git a/src/pages/Organization/SearchPage/OrganizationSearchForm.js b/src/pages/Organization/SearchPage/OrganizationSearchForm.js
index dc384b8..b6e9a46 100644
--- a/src/pages/Organization/SearchPage/OrganizationSearchForm.js
+++ b/src/pages/Organization/SearchPage/OrganizationSearchForm.js
@@ -123,7 +123,7 @@ const OrganizationSearchForm = ({ applySearch }) => {
                                     renderInput={(params) => (
                                         <TextField
                                             {...params}
-                                            label="Creditor/Non-creditor"
+                                            label="Credit Client/Non-credit Client"
                                             InputLabelProps={{
                                                 shrink: true
                                             }}
diff --git a/src/pages/Organization/SearchPage/OrganizationTable.js b/src/pages/Organization/SearchPage/OrganizationTable.js
index ced795c..e4ebe76 100644
--- a/src/pages/Organization/SearchPage/OrganizationTable.js
+++ b/src/pages/Organization/SearchPage/OrganizationTable.js
@@ -85,8 +85,8 @@ export default function OrganizationTable({ recordList }) {
         {
             id: 'creditor',
             field: 'creditor',
-            headerName: 'Creditor',
-            width: 100,
+            headerName: 'Credit Client',
+            width: 150,
             valueGetter: (params) => {
                 return params?.value?"Yes":"";
             }
diff --git a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
index 0b8d7b6..25095cd 100644
--- a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
+++ b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
@@ -20,6 +20,7 @@ import Loadable from 'components/Loadable';
 import { lazy } from 'react';
 const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingComponent')));
 import * as HttpUtils from "utils/HttpUtils"
+import * as DateUtils from "utils/DateUtils"
 import * as UrlUtils from "utils/ApiPathConst"
 import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
 
@@ -93,7 +94,11 @@ const ApplicationDetailCard = (
     };
 
     const complatedClick = () => () => {
-        setStatus("complete")
+        let issueDate = DateUtils.convertToDate(applicationDetailData.gazetteIssueDetail.issueDate);
+        let current = new Date();
+        if(current.getTime() >= issueDate.getTime()){
+            setStatus("complete")
+        }
     };
 
     const withdrawnClick = () => () => {
@@ -225,11 +230,13 @@ const ApplicationDetailCard = (
                                                     // size="large"
                                                     variant="contained"
                                                     onClick={complatedClick()}
+                                                    disabled={(new Date()).getTime() < DateUtils.convertToDate(applicationDetailData.gazetteIssueDetail.issueDate).getTime()}
                                                     sx={{
                                                         textTransform: 'capitalize',
                                                         alignItems: 'end',
                                                         backgroundColor: '#52b202'
                                                     }}>
+                                                    
                                                     <DoneIcon />
                                                     <Typography ml={1} variant="h5">Complete</Typography>
                                                 </Button>
diff --git a/src/translations/en.json b/src/translations/en.json
index 6cbc602..3ca6b38 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -434,9 +434,9 @@
   "organizationProfile": "Organisation Profile",
   "organizationDetails": "Organisation Details",
   "brNo": "BR No.",
-  "creditorAccount": "Creditor account",
+  "creditorAccount": "Credit Client",
   "nameEng": "Name (Eng)",
-  "nameChi": "Name (Ch)",
+  "nameChi": "Name (Chi)",
   "expiryDate": "Expiry date",
   "create": "Create",
   "confirmTo": "Confirm to ",
diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json
index dae5511..4a0ee02 100644
--- a/src/translations/zh-CN.json
+++ b/src/translations/zh-CN.json
@@ -11,7 +11,7 @@
   "Gazette": "宪报",
   "gazetteDate": "宪报日期",
   "gazetteLength": "长度",
-  "gazetteSampleName": "宪报第6号副刊公告",
+  "gazetteSampleName": "宪报第6号副刊公共启事",
   "reason": "原因",
 
   "payInstantly": "即时网上缴费",
@@ -65,7 +65,7 @@
   "MSG.proofOutOfTime": "回覆逾时，请重新申请。",
 
   "registerTitle1": "立即成为",
-  "registerTitle2": "宪报刊登公告",
+  "registerTitle2": "宪报刊登公共启事",
   "registerTitle3": "用户",
   "registerSubTitle": "只需4-5分钟",
   "or": "或",
@@ -400,8 +400,8 @@
 
   "submitApplication": "提交公共启事申请",
   "applicationSubheading": "提供你的启事内容作排版，校对及计价。",
-  "announcement": "公告",
-  "viewAllAnnouncement": "显示所有公告",
+  "announcement": "公共启事",
+  "viewAllAnnouncement": "显示所有公共启事",
   "systemMessage": "系统消息",
   "viewAllSystemMessage": "显示所有消息",
   "msgDetails": "消息详情",
diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json
index 6e1d6c4..32dbc32 100644
--- a/src/translations/zh-HK.json
+++ b/src/translations/zh-HK.json
@@ -11,7 +11,7 @@
   "Gazette": "憲報",
   "gazetteDate": "憲報日期",
   "gazetteLength": "長度",
-  "gazetteSampleName": "憲報第6號副刊公告",
+  "gazetteSampleName": "憲報第6號副刊公共啟事",
   "reason": "原因",
 
   "payInstantly": "即時網上繳費",
@@ -65,7 +65,7 @@
   "MSG.proofOutOfTime": "回覆逾時，請重新申請。",
 
   "registerTitle1": "立即成為",
-  "registerTitle2": "憲報刊登公告",
+  "registerTitle2": "憲報刊登公共啟事",
   "registerTitle3": "用戶",
   "registerSubTitle": "只需4-5分鐘",
   "or": "或",
diff --git a/src/utils/ComboData.js b/src/utils/ComboData.js
index b420866..bd7b12e 100644
--- a/src/utils/ComboData.js
+++ b/src/utils/ComboData.js
@@ -122,6 +122,6 @@ export const denmandNoteStatus_Public = [
 
 export const CreditorStatus = [
     { key: 0, labelCht: '全部', label: 'All',  type: 'all' }, 
-    { key: 1, labelCht: '債權人', label:'Creditor',  type: 'true' },
-    { key: 2, labelCht: '非債權人', label:'No-Creditor', type: 'false' }, 
+    { key: 1, labelCht: '債權人', label:'Credit Client',  type: 'true' },
+    { key: 2, labelCht: '非債權人', label:'Non-Credit Client', type: 'false' }, 
 ];
\ No newline at end of file