diff --git a/src/pages/OrganizationDetailPage/OrganizationCard_loadFromUser.js b/src/pages/OrganizationDetailPage_FromUser/OrganizationCard_loadFromUser.js
similarity index 93%
rename from src/pages/OrganizationDetailPage/OrganizationCard_loadFromUser.js
rename to src/pages/OrganizationDetailPage_FromUser/OrganizationCard_loadFromUser.js
index 090d822..119b705 100644
--- a/src/pages/OrganizationDetailPage/OrganizationCard_loadFromUser.js
+++ b/src/pages/OrganizationDetailPage_FromUser/OrganizationCard_loadFromUser.js
@@ -17,11 +17,11 @@ import {useNavigate} from "react-router-dom";
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
 
-const OrganizationCard = ({userData, id}) => {
+const OrganizationCard_loadFromUser = ({userData, id}) => {
 
     const [currentUserData, setCurrentUserData] = useState(userData);
-    const from = useForm({defaultValues: userData});
-    const {register,reset, handleSubmit} = from;
+    const form = useForm({defaultValues: userData});
+    const {register,reset, handleSubmit} = form;
 
     const navigate = useNavigate();
 
@@ -57,7 +57,8 @@ const OrganizationCard = ({userData, id}) => {
     }, [currentUserData]);
 
 
-    function onSubmitForm(_formData) {
+    const onSubmitForm=(_formData)=>{
+        console.log(_formData);
         HttpUtils.post({
             url: UrlUtils.POST_ORG_SAVE_PATH,
             params: {
@@ -101,10 +102,29 @@ const OrganizationCard = ({userData, id}) => {
                     Information
                 </Typography>
 
-                <form onSubmit={handleSubmit(onSubmitForm)}>
-                
+                <form id="_form" onSubmit={handleSubmit(onSubmitForm)}>
 
                 <Grid container spacing={1}>
+                      {/*bottom top*/}
+                  <Grid item s={12} md={12} lg={12} sx={{mb: 3}} alignItems={"start"} justifyContent="center">
+                   
+
+                   <Grid item sx={{ml: 3, mr: 3}}>
+                       <Button
+                           size="large"
+                           variant="contained"
+                           type="submit"
+                           sx={{
+                               textTransform: 'capitalize',
+                               alignItems: 'end'
+                           }}
+                       >
+                           Create
+                       </Button>
+                   </Grid>
+                
+           </Grid>
+           {/*bottom top*/}
                     <Grid item lg={4} >
                         <Grid container alignItems={"center"}>
                             <Grid item xs={4} s={4} md={4} lg={4}
@@ -340,30 +360,11 @@ const OrganizationCard = ({userData, id}) => {
 
                     </Grid>
 
-                     {/*bottom button*/}
-                <Grid item s={12} md={12} lg={12} sx={{mb: 3}} alignItems={"end"} justifyContent="center">
-                    <Grid container maxWidth justifyContent="flex-end">
-
-                        <Grid item sx={{ml: 3, mr: 3}}>
-                            <Button
-                                size="large"
-                                variant="contained"
-                                type="submit"
-                                sx={{
-                                    textTransform: 'capitalize',
-                                    alignItems: 'end'
-                                }}
-                            >
-                                Create
-                            </Button>
-                        </Grid>
-                         
-                    </Grid>
-                </Grid>
+                   
 
                 </form>
             </MainCard>
     );
 };
 
-export default OrganizationCard;
+export default OrganizationCard_loadFromUser;
diff --git a/src/pages/OrganizationDetailPage/index_loadFormUser.js b/src/pages/OrganizationDetailPage_FromUser/index.js
similarity index 93%
rename from src/pages/OrganizationDetailPage/index_loadFormUser.js
rename to src/pages/OrganizationDetailPage_FromUser/index.js
index 3632d53..96e17cc 100644
--- a/src/pages/OrganizationDetailPage/index_loadFormUser.js
+++ b/src/pages/OrganizationDetailPage_FromUser/index.js
@@ -12,7 +12,7 @@ import * as UrlUtils from "../../utils/ApiPathConst";
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
 
-const OrganizationDetailPage = () => {
+const OrganizationDetailPage_FromUser = () => {
     const params = useParams();
     const [formData, setFormData]  = useState({})
     const [isLoading, setLoding] = useState(true);
@@ -57,7 +57,6 @@ const OrganizationDetailPage = () => {
                         <Grid item xs={12} md={12} lg={12}>
                             <InfoCard
                                 userData={formData}
-                                loadDataFun={loadData}
                                 id={params.id}
                             />
                         </Grid>
@@ -70,4 +69,4 @@ const OrganizationDetailPage = () => {
 };
 
 
-export default OrganizationDetailPage;
+export default OrganizationDetailPage_FromUser;
diff --git a/src/pages/OrganizationSearchPage/OrganizationTable.js b/src/pages/OrganizationSearchPage/OrganizationTable.js
index 5f82703..bc120a8 100644
--- a/src/pages/OrganizationSearchPage/OrganizationTable.js
+++ b/src/pages/OrganizationSearchPage/OrganizationTable.js
@@ -19,7 +19,7 @@ export default function OrganizationTable({recordList}) {
     }, [recordList]);
 
     const handleActionClick = (id) => () => {
-        navigate('/orgUser/'+ id);
+        navigate('/org/'+ id);
     };
 
     const columns = [
diff --git a/src/pages/pnspsUserDetailPage_Individual/UserInformationCard_Individual.js b/src/pages/pnspsUserDetailPage_Individual/UserInformationCard_Individual.js
index 51d82f2..a686f87 100644
--- a/src/pages/pnspsUserDetailPage_Individual/UserInformationCard_Individual.js
+++ b/src/pages/pnspsUserDetailPage_Individual/UserInformationCard_Individual.js
@@ -94,31 +94,32 @@ const UserInformationCard_Individual = ({userData,userFile, loadDataFun}) => {
     }, [currentUserData]);
 
 
-    function onSubmitForm() {
+    function onSubmitForm(_data) {
+
         HttpUtils.post({
             url: UrlUtils.POST_IND_USER+"/"+userData.id,
             params: {
-                prefix: formik.values.prefix,
+                prefix: _data.prefix,
                 enName: formik.values.enName,
-                chName: formik.values.chName,
+                chName: _data.chName,
                 idDocType: idDocType,
                 contactTel: {
-                    countryCode: formik.values.tel_countryCode,
-                    phoneNumber: formik.values.phoneNumber
+                    countryCode: _data.tel_countryCode,
+                    phoneNumber: _data.phoneNumber
                 },
                 identification: formik.values.identification,
                 checkDigit: formik.values.checkDigit,
                 faxNo:{
-                    countryCode: formik.values.fax_countryCode,
-                    faxNumber: formik.values.faxNumber
+                    countryCode: _data.fax_countryCode,
+                    faxNumber: _data.faxNumber
                 },
-                emailAddress:formik.values.emailAddress,
+                emailAddress:_data.emailAddress,
                 address:{
                     country:country,
                     district:district,
-                    addressLine1: formik.values.addressLine1,
-                    addressLine2: formik.values.addressLine2,
-                    addressLine3: formik.values.addressLine3,
+                    addressLine1: _data.addressLine1,
+                    addressLine2: _data.addressLine2,
+                    addressLine3: _data.addressLine3,
                 },
             },
             onSuccess: function(){
diff --git a/src/pages/pnspsUserDetailPage_Individual/index.js b/src/pages/pnspsUserDetailPage_Individual/index.js
index e2927bd..6d2a4a4 100644
--- a/src/pages/pnspsUserDetailPage_Individual/index.js
+++ b/src/pages/pnspsUserDetailPage_Individual/index.js
@@ -20,7 +20,6 @@ const UserMaintainPage_Individual = () => {
 
 
     useEffect(()=>{
-        console.log(userData);
         loadData();
     },[]);
 
diff --git a/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js b/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
index 87f3310..ad56319 100644
--- a/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
+++ b/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
@@ -1,7 +1,7 @@
 // material-ui
 import {
     Grid, TextField, Typography, Button,
-    OutlinedInput, FormHelperText
+    OutlinedInput, FormHelperText, Autocomplete
 } from '@mui/material';
 import MainCard from "../../components/MainCard";
 import * as React from "react";
@@ -10,6 +10,7 @@ import {useEffect, useState} from "react";
 import * as DateUtils from '../../utils/DateUtils';
 import * as HttpUtils from '../../utils/HttpUtils';
 import * as UrlUtils from "../../utils/ApiPathConst";
+import * as ComboData from "../../utils/ComboData";
 
 import { useFormik,FormikProvider } from 'formik';
 import * as yup from 'yup';
@@ -23,6 +24,9 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
     const [editMode, setEditMode] = useState(false);
     const [locked, setLocked] = useState(false);
 
+    const [district, setDistrict] = useState(null);
+    const [country, setCountry] = useState(ComboData.country[0]);
+
     const from = useForm({defaultValues: userData});
     const {register,reset, handleSubmit} = from;
 
@@ -57,6 +61,8 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
         userData["modifieDate"] = modifiedBy;
         userData["verifiedStatus"] = userData.verifiedBy? DateUtils.datetimeStr(userData.verifiedDate)+", "+userData.verifiedByName: "Not verify yet";
 
+        userData["lastLoginDate"] = userData.lastLogin?DateUtils.datetimeStr(lastLoginDate):"";
+
         userData["country"] = userData.addressBus?.country;
         userData["district"] = userData.addressBus?.district;
         userData["addressLine1"] = userData.addressBus?.addressLine1;
@@ -68,6 +74,12 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
 
         userData["faxNumber"] = userData.faxNo?.faxNumber;
         userData["fax_countryCode"] = userData.faxNo?.countryCode;
+
+        userData["brExpiryDate"] = userData.brExpiryDate?DateUtils.convertToDate(brExpiryDate):"";
+
+
+        setDistrict(userData.district);
+        setCountry(userData.country);
         
         setCurrentUserData(userData);
     }, [userData]);
@@ -79,33 +91,33 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
 
 
 
-    function onSubmitForm() {
+    function onSubmitForm(_data) {
         HttpUtils.post({
             url: UrlUtils.POST_IND_USER+"/"+userData.id,
             params: {
-                chName: formik.values.chName,
-                enName: formik.values.enName,
+                chName: _data.chName,
+                enName: _data.enName,
                 contactTel: {
-                    countryCode: formik.values.tel_countryCode,
-                    phoneNumber: formik.values.phoneNumber
+                    countryCode: _data.tel_countryCode,
+                    phoneNumber: _data.phoneNumber
                 },
                 faxNo: {
-                    countryCode: formik.values.fax_countryCode,
-                    faxNumber: formik.values.faxNumber
+                    countryCode: _data.fax_countryCode,
+                    faxNumber: _data.faxNumber
                 },
                 addressBus: {
-                    country: formik.values.country,
-                    district: formik.values.district,
-                    addressLine1: formik.values.addressLine1,
-                    addressLine2: formik.values.addressLine2,
-                    addressLine3: formik.values.addressLine3,
+                    country: country,
+                    district: district,
+                    addressLine1: _data.addressLine1,
+                    addressLine2: _data.addressLine2,
+                    addressLine3: _data.addressLine3,
                 },
-                identification: formik.values.identification,
-                emailBus:formik.values.emailBus,
-                contactPerson: formik.values.contactPerson,
-                enCompanyName: formik.values.enCompanyName,
-                chCompanyName: formik.values.chCompanyName,
-                brNo: formik.values.brNo,
+                identification: _data.identification,
+                emailBus:_data.emailBus,
+                contactPerson: _data.contactPerson,
+                enCompanyName: _data.enCompanyName,
+                chCompanyName: _data.chCompanyName,
+                brNo: _data.brNo,
                 brExpiryDate: formik.values.brExpiryDate,
 
             },
@@ -437,11 +449,8 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
 
                                       <TextField
                                              fullWidth
-                                             {...register("lastLogin",
-                                                 {
-                                                     value: currentUserData?.lastLogin,
-                                                 })}
-                                             id='lastLogin'
+                                             {...register("lastLoginDate")}
+                                             id='lastLoginDate'
                                              disabled
                                         >
                                         </TextField>
@@ -603,7 +612,7 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
                                     <TextField
                                         fullWidth
                                         {...register("contactPerson")}
-                                        id='brExpiryDateTemp'
+                                        id='contactPerson'
                                         disabled={!editMode}
                                     />
                                 </Grid>
@@ -651,6 +660,7 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
                                             id="brExpiryDate"
                                             type="date"
                                             value={formik.values.brExpiryDate}
+                                            format="dd/MM/yyyy"
                                             name="brExpiryDate"
                                             onChange={formik.handleChange}
                                             placeholder="與與商業登記證相同如有"
@@ -701,7 +711,7 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
                             </Grid>
                         </Grid>
 
-                        <Grid item lg={4} >
+                        <Grid item lg={4}>
                             <Grid container alignItems={"center"}>
                                 <Grid item xs={4} s={4} md={4} lg={4}
                                       sx={{ml: 3, mr: 3, display: 'flex', alignItems: 'center'}}>
@@ -709,17 +719,25 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
                                 </Grid>
 
                                 <Grid item xs={7} s={7} md={7} lg={6}>
-                                    <TextField
-                                        fullWidth
-                                        {...register("district")}
-                                        id='district'
-                                        disabled={!editMode}
-                                    />
+                                      <Autocomplete
+                                                    fullWidth
+                                                    disablePortal
+                                                    id="district"
+                                                    {...register("district")}
+                                                    value={district}
+                                                    options={ComboData.district}
+                                                    onChange={(event, newValue) => {
+                                                        setDistrict(newValue);
+                                                    }}
+                                                    disabled={!editMode}
+                                                    sx={{"& .MuiInputBase-root": { height: "41px" },"#district":{padding: "0px 0px 0px 0px"}, "& .MuiAutocomplete-endAdornment": { top: "auto" },}}
+                                                    renderInput={(params) => <TextField {...params} placeholder="區域 (只適用於香港)"/>}
+                                        />
+                                       
                                 </Grid>
                             </Grid>
                         </Grid>
-
-                        <Grid item lg={4} >
+                        <Grid item lg={4}>
                             <Grid container alignItems={"center"}>
                                 <Grid item xs={4} s={4} md={4} lg={4}
                                       sx={{ml: 3, mr: 3, display: 'flex', alignItems: 'center'}}>
@@ -727,16 +745,26 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
                                 </Grid>
 
                                 <Grid item xs={7} s={7} md={7} lg={6}>
-                                    <TextField
-                                        fullWidth
-                                        {...register("country")}
-                                        id='country'
+                                    <Autocomplete
+                                    fullWidth
+                                        disablePortal
                                         disabled={!editMode}
+                                        id="country"
+                                        value={country}
+                                        options={ComboData.country}
+                                        {...register("country")}
+                                        onChange={(event, newValue) => {
+                                            setCountry(newValue);
+                                        }}
+                                        
+                                        sx={{"& .MuiInputBase-root": { height: "41px" },"#country":{padding: "0px 0px 0px 0px"}, "& .MuiAutocomplete-endAdornment": { top: "auto" },}}
+                                        renderInput={(params) => <TextField {...params} placeholder="國家/地區"/>}
                                     />
                                 </Grid>
+
+                                
                             </Grid>
                         </Grid>
-
                        </Grid>
 
                 </form>
diff --git a/src/routes/SettingRoutes.js b/src/routes/SettingRoutes.js
index 7cafcfc..2e8fbb4 100644
--- a/src/routes/SettingRoutes.js
+++ b/src/routes/SettingRoutes.js
@@ -17,7 +17,7 @@ const UserGroupSearchPage = Loadable(lazy(() => import('pages/pnspsUserGroupSear
 const UserGroupDetailPage = Loadable(lazy(() => import('pages/pnspsUserGroupDetailPage')));
 const OrganizationSearchPage = Loadable(lazy(() => import('pages/OrganizationSearchPage')));
 const OrganizationDetailPage = Loadable(lazy(() => import('pages/OrganizationDetailPage')));
-const OrganizationDetailPage_fromUser = Loadable(lazy(() => import('pages/OrganizationDetailPage/index_loadFormUser')));
+const OrganizationDetailPage_fromUser = Loadable(lazy(() => import('pages/OrganizationDetailPage_FromUser')));
 
 
 // ==============================|| AUTH ROUTING ||============================== //
diff --git a/src/utils/DateUtils.js b/src/utils/DateUtils.js
index caccb2a..0009fef 100644
--- a/src/utils/DateUtils.js
+++ b/src/utils/DateUtils.js
@@ -10,9 +10,12 @@ export const dateStr = (date) =>{
     return dayjs(date).format("DD-MM-YYYY")
 };
 
-const convertToDate = (date)=>{
+export const convertToDate = (date)=>{
     if(Array.isArray(date)){
         return new Date(date[0],date[1],date[2],date[3],date[4],date[5]);
     }
+    if(typeof date == 'number'){
+        return new Date(date);
+    }
     return date;
 }
\ No newline at end of file