diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js
index a1a9b63..03a9a07 100644
--- a/src/layout/MainLayout/Header/index.js
+++ b/src/layout/MainLayout/Header/index.js
@@ -115,7 +115,7 @@ function Header(props) {
         <Link className="dashboard" to='/dashboard'>主頁</Link>
       </li>
       <li>
-        <Link className="myDocumet" to='/dashboard'>我的公共啟示</Link>
+        <Link className="myDocumet" to='/dashboard'>我的公共啟事</Link>
       </li>
       <li>
         <Link className="documentRecord" to='/dashboard'>校對記錄</Link>
diff --git a/src/pages/authentication/auth-forms/BusCustomFormWizard.js b/src/pages/authentication/auth-forms/BusCustomFormWizard.js
index b0d08c3..176481a 100644
--- a/src/pages/authentication/auth-forms/BusCustomFormWizard.js
+++ b/src/pages/authentication/auth-forms/BusCustomFormWizard.js
@@ -81,6 +81,7 @@ const BusCustomFormWizard = (props) => {
     const [termsAndConAccept, setTermsAndConAccept] = useState(false);
     const [termsAndConNotAccept, setTermsAndConNotAccept] = useState(false);
     const [isValid, setisValid] = useState(false);
+    const [checkCountry, setCheckCountry] = useState(false);
     
     const address4ComboList = 
         ["北區","長洲區","大埔區","大嶼山區","東區","觀塘區","黃大仙區","九龍城區","葵青區","南區","南丫島區",
@@ -745,6 +746,7 @@ const BusCustomFormWizard = (props) => {
                                                     id="address4-combo"
                                                     value={selectedAddress4 === null ? null : selectedAddress4}
                                                     options={address4ComboList}
+                                                    disabled={checkCountry}
                                                     onChange={(event, newValue) => {
                                                         if (newValue !== null){
                                                             setSelectedAddress4(newValue);
@@ -762,6 +764,13 @@ const BusCustomFormWizard = (props) => {
                                                     onChange={(event, newValue) => {
                                                         if (newValue !== null){
                                                             setSelectedAddress5(newValue);
+                                                            if(newValue=='香港'){
+                                                                setCheckCountry(false)
+                                                            }else{
+                                                                setCheckCountry(true)
+                                                            }
+                                                        }else{
+                                                            setCheckCountry(true)
                                                         }
                                                     }}
                                                     
diff --git a/src/pages/authentication/auth-forms/CustomFormWizard.js b/src/pages/authentication/auth-forms/CustomFormWizard.js
index 18276c2..6c36964 100644
--- a/src/pages/authentication/auth-forms/CustomFormWizard.js
+++ b/src/pages/authentication/auth-forms/CustomFormWizard.js
@@ -86,6 +86,7 @@ const CustomFormWizard = (props) => {
     const [termsAndConAccept, setTermsAndConAccept] = useState(false);
     const [termsAndConNotAccept, setTermsAndConNotAccept] = useState(false);
     const [isValid, setisValid] = useState(false);
+    const [checkCountry, setCheckCountry] = useState(false);
 
     const idDocTypeComboList = ComboData.idDocType;
     const address4ComboList = ComboData.district;
@@ -852,6 +853,7 @@ const CustomFormWizard = (props) => {
                                                     id="address4-combo"
                                                     value={selectedAddress4}
                                                     options={address4ComboList}
+                                                    disabled={checkCountry}
                                                     onChange={(event, newValue) => {
                                                         setSelectedAddress4(newValue);
                                                     }}
@@ -865,8 +867,16 @@ const CustomFormWizard = (props) => {
                                                     value={selectedAddress5}
                                                     options={address5ComboList}
                                                     onChange={(event, newValue) => {
-                                                        setSelectedAddress5(newValue);
-                                                        // if()
+                                                        if (newValue !== null){
+                                                            setSelectedAddress5(newValue);
+                                                            if(newValue=='香港'){
+                                                                setCheckCountry(false)
+                                                            }else{
+                                                                setCheckCountry(true)
+                                                            }
+                                                        }else{
+                                                            setCheckCountry(true)
+                                                        }
                                                     }}
                                                     
                                                     sx={{"& .MuiInputBase-root": { height: "41px" },"#address5-combo":{padding: "0px 0px 0px 0px"}, "& .MuiAutocomplete-endAdornment": { top: "auto" },}}
diff --git a/src/pages/pnspsUserSearchPage/UserTable.js b/src/pages/pnspsUserSearchPage/UserTable.js
index fc5a46b..c9b2e91 100644
--- a/src/pages/pnspsUserSearchPage/UserTable.js
+++ b/src/pages/pnspsUserSearchPage/UserTable.js
@@ -69,14 +69,14 @@ export default function UserTable({recordList}) {
             headerName: 'Email',
             flex: 1,
         },
-        {
-            id: 'subDivisionId',
-            field: 'subDivisionId',
-            //type: 'date',
-            //sortable: false,
-            headerName: 'Sub-Division',
-            flex: 1,
-        },
+        // {
+        //     id: 'subDivisionId',
+        //     field: 'subDivisionId',
+        //     //type: 'date',
+        //     //sortable: false,
+        //     headerName: 'Sub-Division',
+        //     flex: 1,
+        // },
 
         // {
         //     id: 'subDivisionId',
diff --git a/src/pages/publicDashboard/index.js b/src/pages/publicDashboard/index.js
index 30559fd..502d7d8 100644
--- a/src/pages/publicDashboard/index.js
+++ b/src/pages/publicDashboard/index.js
@@ -6,7 +6,9 @@ import {
   Typography,
   Stack
 } from '@mui/material';
-
+import {
+  isORGLoggedIn,
+} from "utils/Utils";
 
 
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
@@ -25,7 +27,7 @@ const DashboardDefault = () => {
         <Grid item xs={12} height='60px'>
           <Stack direction="row" height='100%' justifyContent="flex-start" alignItems="center">
             {/* <Typography variant="h5">我的公共啟事</Typography> */}
-            <Typography ml={10} color='#FFF' variant="h4">{userData.fullchName}, 午安! 請選擇所需服務。</Typography>
+            <Typography ml={10} color='#FFF' variant="h4">{isORGLoggedIn() ?userData.fullenName:userData.fullchName}, 午安! 請選擇所需服務。</Typography>
           </Stack>
         </Grid>
       </div>