diff --git a/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js b/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
index 5ea7a8f..54b2391 100644
--- a/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
+++ b/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
@@ -28,13 +28,13 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
         let modifiedBy = DateUtils.datetimeStr(userData.modified)+", "+userData.modifiedBy;
         userData["createDate"] = createDate;
         userData["modifieDate"] = modifiedBy;
-        userData["verifiedStatus"] = userData.verifiedBy? "Not verify yet":DateUtils.datetimeStr(userData.verifiedDate)+", "+userData.verifiedByName;
+        userData["verifiedStatus"] = userData.verifiedBy? DateUtils.datetimeStr(userData.verifiedDate)+", "+userData.verifiedByName: "Not verify yet";
 
-        userData["country"] = userData.address?.country;
-        userData["district"] = userData.address?.district;
-        userData["addressLine1"] = userData.address?.addressLine1;
-        userData["addressLine2"] = userData.address?.addressLine2;
-        userData["addressLine3"] = userData.address?.addressLine3;
+        userData["country"] = userData.addressBus?.country;
+        userData["district"] = userData.addressBus?.district;
+        userData["addressLine1"] = userData.addressBus?.addressLine1;
+        userData["addressLine2"] = userData.addressBus?.addressLine2;
+        userData["addressLine3"] = userData.addressBus?.addressLine3;
 
         userData["phoneNumber"] = userData.contactTel?.phoneNumber;
         userData["tel_countryCode"] = userData.contactTel?.countryCode;
@@ -117,6 +117,65 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
                 </Typography>
 
                 <form onSubmit={handleSubmit(onSubmitForm)}>
+
+                {/*top button*/}
+                <Grid item s={12} md={12} lg={12} sx={{mb: 3}} alignItems={"start"} justifyContent="center">
+                    <Grid container maxWidth justifyContent="flex-start">
+                         
+                    {editMode?
+                    <>
+                     <Grid item sx={{ml: 3, mr: 3}}>
+                            <Button
+                                size="large"
+                                variant="contained"
+                                onClick={loadDataFun}
+                                sx={{
+                                    textTransform: 'capitalize',
+                                    alignItems: 'end'
+                                }}
+                            >
+                                Cancel Edit
+                            </Button>
+                        </Grid>
+                        <Grid item sx={{ml: 3, mr: 3}}>
+                            <Button
+                                size="large"
+                                variant="contained"
+                                type="submit"
+                                color="success"
+                                sx={{
+                                    textTransform: 'capitalize',
+                                    alignItems: 'end'
+                                }}
+                            >
+                                Save
+                            </Button>
+                        </Grid>
+                       
+                        </>
+                        :
+                        <>
+                        
+                        <Grid item sx={{ml: 3, mr: 3}}>
+                            <Button
+                                size="large"
+                                variant="contained"
+                                sx={{
+                                    textTransform: 'capitalize',
+                                    alignItems: 'end'
+                                }}
+                                onClick={onEditClick}
+                            >
+                                Edit
+                            </Button>
+                        </Grid>
+                        </>
+                    }
+                    
+                        
+                    </Grid>
+                </Grid>
+ {/*end top button*/}
                                
                     <Grid container spacing={1}>
                         <Grid item lg={4} >
@@ -311,7 +370,7 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
                                                     alignItems: 'end'
                                                 }}
                                             >
-                                                Verified
+                                                Verify
                                             </Button>
                                         </Grid>
                                     </>
@@ -352,106 +411,69 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
                                       sx={{ml: 3, mr: 3, display: 'flex', alignItems: 'center'}}>
                                     Status:
                                 </Grid>
+                                {
+                                    editMode?
+                                        <Grid item xs={7} s={7} md={7} lg={6}>
+                                            <TextField
+                                                fullWidth
+                                                {...register("status")}
+                                                id='status'
+                                                disabled
+                                            />
+                                        </Grid>
+                                    :
+                                        <>
+
+                                        <Grid item  lg={4}>
+                                            <TextField
+                                                fullWidth
+                                                {...register("status")}
+                                                id='status'
+                                                disabled
+                                            />
+                                        </Grid>
+                                        {locked?
+                                        <Grid lg={1}>
+                                        <Button
+                                        size="large"
+                                        variant="contained"
+                                        color="success"
+                                        sx={{
+                                            textTransform: 'capitalize',
+                                            alignItems: 'end'
+                                        }}
+                                        onClick={doUnlock}
+                                        >
+                                        Active
+                                        </Button>
+                                        </Grid>
+                                        :
+                                        <Grid item lg={1}>
+                                        <Button
+                                        size="large"
+                                        variant="contained"
+                                        color="error"
+                                        sx={{
+                                            textTransform: 'capitalize',
+                                            alignItems: 'end'
+                                        }}
+                                        onClick={doLock}
+                                        >
+                                        Lock
+                                        </Button>
+                                        </Grid>
+                                        }
+
+                                        </>
+                                }
+                                
+
 
-                                <Grid item xs={7} s={7} md={7} lg={6}>
-                                    <TextField
-                                        fullWidth
-                                        {...register("status")}
-                                        id='status'
-                                        disabled
-                                    />
-                                </Grid>
                             </Grid>
                         </Grid>
 
                     </Grid>
 
-                     {/*bottom button*/}
-                <Grid item s={12} md={12} lg={12} sx={{mb: 3}} alignItems={"end"} justifyContent="center">
-                    <Grid container maxWidth justifyContent="flex-end">
-                         
-                    {editMode?
-                    <>
-                        <Grid item sx={{ml: 3, mr: 3}}>
-                            <Button
-                                size="large"
-                                variant="contained"
-                                type="submit"
-                                color="success"
-                                sx={{
-                                    textTransform: 'capitalize',
-                                    alignItems: 'end'
-                                }}
-                            >
-                                Save
-                            </Button>
-                        </Grid>
-                        <Grid item sx={{ml: 3, mr: 3}}>
-                            <Button
-                                size="large"
-                                variant="contained"
-                                onClick={loadDataFun}
-                                sx={{
-                                    textTransform: 'capitalize',
-                                    alignItems: 'end'
-                                }}
-                            >
-                                Cancel & Back
-                            </Button>
-                        </Grid>
-                        </>
-                        :
-                        <>
-                        {locked?
-                        <Grid item sx={{ml: 3, mr: 3}}>
-                            <Button
-                                size="large"
-                                variant="contained"
-                                color="primary"
-                                sx={{
-                                    textTransform: 'capitalize',
-                                    alignItems: 'end'
-                                }}
-                                onClick={doUnlock}
-                            >
-                                Unlock
-                            </Button>
-                        </Grid>
-                        :
-                        <Grid item sx={{ml: 3, mr: 3}}>
-                            <Button
-                                size="large"
-                                variant="contained"
-                                color="primary"
-                                sx={{
-                                    textTransform: 'capitalize',
-                                    alignItems: 'end'
-                                }}
-                                onClick={doLock}
-                            >
-                                Lock
-                            </Button>
-                        </Grid>
-                        }
-                        <Grid item sx={{ml: 3, mr: 3}}>
-                            <Button
-                                size="large"
-                                variant="contained"
-                                sx={{
-                                    textTransform: 'capitalize',
-                                    alignItems: 'end'
-                                }}
-                                onClick={onEditClick}
-                            >
-                                Edit
-                            </Button>
-                        </Grid>
-                        </>
-                    }
-                    
-                        
-                    </Grid>
-                </Grid>
 
                 <Grid container spacing={1}>
                     <Grid item lg={1} >
diff --git a/src/pages/pnspsUserDetailPage_Organization/index.js b/src/pages/pnspsUserDetailPage_Organization/index.js
index 32b2d1d..a4ac7ce 100644
--- a/src/pages/pnspsUserDetailPage_Organization/index.js
+++ b/src/pages/pnspsUserDetailPage_Organization/index.js
@@ -4,7 +4,6 @@ import {useEffect, useState} from "react";
 import * as React from "react";
 //import axios from "axios";
 import * as HttpUtils from "../../utils/HttpUtils";
-import {apiPath} from "../../auth/utils";
 import {useParams} from "react-router-dom";
 import FileList from "../../components/FileList"
 import MainCard from "../../components/MainCard";
@@ -29,8 +28,11 @@ const UserMaintainPage_Organization = () => {
     const loadData = ()=>{
         setLoding(true);
         HttpUtils.get({
-            url: `${apiPath}${UrlUtils.GET_USER_PATH}/${params.id}`,
+            url: `${UrlUtils.GET_ORG_USER_PATH}/${params.id}`,
             onSuccess: function(response){
+                response.data["addressBus"] = JSON.parse(response.data["address"]);
+                response.data["contactTel"] = JSON.parse(response.data["contactTel"]);
+                response.data["faxNo"] = JSON.parse(response.data["faxNo"]);
                 setUserData(response.data)
             }
         });