diff --git a/src/pages/authentication/ForgotUsername/AfterForgotPasswordPage.js b/src/pages/authentication/ForgotUsername/AfterForgotUsernamePage.js
similarity index 55%
rename from src/pages/authentication/ForgotUsername/AfterForgotPasswordPage.js
rename to src/pages/authentication/ForgotUsername/AfterForgotUsernamePage.js
index fbbe889..e4352df 100644
--- a/src/pages/authentication/ForgotUsername/AfterForgotPasswordPage.js
+++ b/src/pages/authentication/ForgotUsername/AfterForgotUsernamePage.js
@@ -21,7 +21,7 @@ import {FormattedMessage, useIntl} from "react-intl";
 
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
-const AfterForgotPasswordPage = () => {
+const AfterForgotUsernamePage = () => {
     const intl = useIntl();
     const navigate = useNavigate();
 
@@ -46,23 +46,11 @@ const AfterForgotPasswordPage = () => {
                 <div style={BackgroundHead}>
                     <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
                         <Typography ml={15} color='#FFF' variant="h4" sx={{display: { xs: 'none', sm: 'none', md: 'block' }}}>
-                            <FormattedMessage id="forgotUserPassword"/>
+                            <FormattedMessage id="forgotUsername"/>
                         </Typography>
                     </Stack>
                 </div>
             </Grid>
-            {/* <Grid item xs={12} width={{xs:"90%", sm:"90%", md:"60%", lg:"60%"}}>
-                <Button
-                    aria-label={intl.formatMessage({id: 'back'})}
-                    title={intl.formatMessage({id: 'back'})}
-                    sx={{ ml: 0, mt: 2.5 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate(-1) }}
-                >
-                    <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} />
-                </Button>
-            </Grid> */}
-            {/* <Grid item xs={12}>
-                    <Typography variant="pnspsFormParagraphBold">申請公共啟事</Typography>
-                </Grid> */}
             <Grid item xs={12} md={12} width={{ sx:"90%", sm:"90%",md: "60%", xs: "90%" }}>
                 <MainCard
                     sx={{
@@ -83,56 +71,17 @@ const AfterForgotPasswordPage = () => {
                                 <Grid item xs={12} md={12} lg={12} >
                                     <InputLabel htmlFor="email-login-title1">
                                         <Typography variant="h5" >
-                                            <FormattedMessage id="sentSecurityCode1"/>
+                                            <FormattedMessage id="sendUsernameSuccess"/>
                                         </Typography>
                                     </InputLabel>
                                 </Grid>
                                 <Grid item xs={12} md={12} lg={12} >
                                     <InputLabel htmlFor="email-login-title2">
                                         <Typography variant="h5" >
-                                            <FormattedMessage id="sentSecurityCode2"/>
-                                        </Typography>
-                                    </InputLabel>
-                                </Grid>
-                                {/* <Grid item xs={12} md={12} lg={12} sx={{mt:3}}>
-                                    <InputLabel htmlFor="email-login-title3">
-                                        <Typography variant="h5" >
-                                            <FormattedMessage id="requireSecurityCode"/>
-                                        </Typography>
-                                    </InputLabel>
-                                </Grid> */}
-                            </Grid>
-                        </Grid>
-                        <Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { md: 'none', xl: 'none', lg: 'none' } }}>
-                            <Grid container direction="column" alignItems="center">
-                                <Grid item xs={12} md={12} lg={12} >
-                                    <InputLabel htmlFor="email-login-title1">
-                                        <Typography variant="h5" >
-                                            <FormattedMessage id="sentSecurityCode1"/>
+                                            <FormattedMessage id="sendUsernameSuccess2"/>
                                         </Typography>
                                     </InputLabel>
                                 </Grid>
-                                <Grid item xs={12} md={12} lg={12} >
-                                    <InputLabel htmlFor="email-login-title2">
-                                        <Typography variant="h5" >
-                                            <FormattedMessage id="sentSecurityCode3"/>
-                                        </Typography>
-                                    </InputLabel>
-                                </Grid>
-                                <Grid item xs={12} md={12} lg={12} >
-                                    <InputLabel htmlFor="email-login-title4">
-                                        <Typography variant="h5" >
-                                            <FormattedMessage id="sentSecurityCode4"/>
-                                        </Typography>
-                                    </InputLabel>
-                                </Grid>
-                                {/* <Grid item xs={12} md={12} lg={12} sx={{mt:3}}>
-                                    <InputLabel htmlFor="email-login-title3">
-                                        <Typography variant="h5" >
-                                            <FormattedMessage id="requireSecurityCode"/>
-                                        </Typography>
-                                    </InputLabel>
-                                </Grid> */}
                             </Grid>
                         </Grid>
                         <Grid item xs={12} md={12} lg={12} mt={1} sx={{mb:3}}>
@@ -156,4 +105,4 @@ const AfterForgotPasswordPage = () => {
 };
 
 
-export default AfterForgotPasswordPage;
+export default AfterForgotUsernamePage;
diff --git a/src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js b/src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js
index bb90ab7..ae735d3 100644
--- a/src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js
+++ b/src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js
@@ -70,11 +70,11 @@ const ForgotUsernameApplyForm = () => {
                 // files: [attachment],
                 onSuccess: function () {
                     // notifyActionSuccess(intl.formatMessage({id: 'submissionSuccess'}) + '!')
-                    navigate('/forgot/password/sent');
+                    navigate('/forgot/username/sent');
                     // location.reload(); 
                 },
                 onError:function () {
-                    navigate('/forgot/password/sent');
+                    navigate('/forgot/username/sent');
                 }
             });
         }
@@ -100,9 +100,6 @@ const ForgotUsernameApplyForm = () => {
                     <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} />
                 </Button>
             </Grid>
-            {/* <Grid item xs={12}>
-                    <Typography variant="pnspsFormParagraphBold">申請公共啟事</Typography>
-                </Grid> */}
             <Grid item xs={12} md={12} width={{ md: "60%", xs: "90%" }}>
                 <MainCard
                     sx={{
diff --git a/src/pages/authentication/ForgotUsername/index.js b/src/pages/authentication/ForgotUsername/index.js
index f123c8f..e57cac8 100644
--- a/src/pages/authentication/ForgotUsername/index.js
+++ b/src/pages/authentication/ForgotUsername/index.js
@@ -38,10 +38,7 @@ const ApplyForm = () => {
                 </Grid>
             </Grid>
             :
-            <ForgotUsernameApplyForm
-                // loadedData={userData}
-                // selections={selections}
-            />
+            <ForgotUsernameApplyForm />
     );
 };
 
diff --git a/src/routes/LoginRoutes.js b/src/routes/LoginRoutes.js
index 3abfc69..965cac9 100644
--- a/src/routes/LoginRoutes.js
+++ b/src/routes/LoginRoutes.js
@@ -21,7 +21,7 @@ const ForgotPassword_Callback = Loadable(lazy(() => import('pages/authentication
 const ForgotPassword_Success = Loadable(lazy(() => import('pages/authentication/ForgotPassword/AuthCallback/ResetPasswordSuccess')));
 
 const ForgotUsername = Loadable(lazy(() => import('pages/authentication/ForgotUsername')));
-const AfterForgotUsernamePage = Loadable(lazy(() => import('pages/authentication/ForgotUsername/AfterForgotPasswordPage')));
+const AfterForgotUsernamePage = Loadable(lazy(() => import('pages/authentication/ForgotUsername/AfterForgotUsernamePage')));
 const ForgotUsername_Callback = Loadable(lazy(() => import('pages/authentication/ForgotUsername/AuthCallback')));
 const ForgotUsername_Success = Loadable(lazy(() => import('pages/authentication/ForgotUsername/AuthCallback/ResetPasswordSuccess')));
 
diff --git a/src/translations/en.json b/src/translations/en.json
index 610357e..363de1b 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -177,8 +177,10 @@
   "forgotPasswordSubTitle1": "Please enter your username to receive",
   "forgotPasswordSubTitle2": "the code to reset your password",
 
-  "forgotUsernameSubTitle": "Please enter your email to receive the code to reset your password",
+  "forgotUsernameSubTitle": "Please enter your email to receive the userName",
   "forgotUsernameSubTitle1": "Please enter your email to receive",
+  "sendUsernameSuccess": "The username has been emailed to you.",
+  "sendUsernameSuccess2": "Please check your emails.",
   
   "resetPasswordSuccess": "Password reset successfully.",
   "securityCode": "Security Code",
diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json
index 4e678cb..2136ff2 100644
--- a/src/translations/zh-CN.json
+++ b/src/translations/zh-CN.json
@@ -207,11 +207,16 @@
   "setNewPassword": "请输入新密码",
   "forgotUserPassword": "忘记密码",
   "forgotUsername": "忘记用户登入名称",
+  
   "forgotPasswordTitle": "寻找你的帐号",
   "forgotPasswordSubTitle": "请输入你的用户登入名称以重设密码",
   "forgotPasswordSubTitle1": "请输入你的用户登入名称收",
   "forgotPasswordSubTitle2": "以重设密码",
+  "forgotUsernameSubTitle": "请输入你的电邮地址以寻找用户名称",
+  "forgotUsernameSubTitle1": "请输入你的电邮地址",
   "resetPasswordSuccess": "已成功重设密码。",
+  "sendUsernameSuccess": "我们已将用户名称送至你的电邮地址。",
+  "sendUsernameSuccess2": "请查看你的电邮信箱。",
   "securityCode": "安全验证码",
   "sentSecurityCode1": "我们已将验证码送至你的电邮地址：",
   "sentSecurityCode2": "请查看你的电邮信箱中是否有包含验证码的信件。",
diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json
index a21e789..1534c49 100644
--- a/src/translations/zh-HK.json
+++ b/src/translations/zh-HK.json
@@ -213,8 +213,10 @@
   "forgotPasswordSubTitle": "請輸入你的用戶登入名稱以重設密碼",
   "forgotPasswordSubTitle1": "請輸入你的用戶登入名稱",
   "forgotPasswordSubTitle2": "以重設密碼",
-  "forgotUsernameSubTitle": "請輸入你的電郵地址以重設密碼",
+  "forgotUsernameSubTitle": "請輸入你的電郵地址以尋找用戶名稱",
   "forgotUsernameSubTitle1": "請輸入你的電郵地址",
+  "sendUsernameSuccess": "我們已將用戶名稱送至你的電郵地址。",
+  "sendUsernameSuccess2": "請查看你的電郵信箱。",
   "resetPasswordSuccess": "已成功重設密碼。",
   "securityCode": "安全驗證碼",
   "sentSecurityCode1": "我們已將驗證碼送至你的電郵地址：",