diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/Navigator.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/Navigator.java
index 1ccb203c8..e4ee5657b 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/Navigator.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/Navigator.java
@@ -60,9 +60,16 @@ public class Navigator extends StackPane {
         Logging.LOG.info("Navigate to " + node);
 
         stack.push(node);
-        fireEvent(new NavigationEvent(this, from, NavigationEvent.NAVIGATING));
+
+        NavigationEvent navigating = new NavigationEvent(this, from, NavigationEvent.NAVIGATING);
+        fireEvent(navigating);
+        node.fireEvent(navigating);
+
         setContent(node);
-        fireEvent(new NavigationEvent(this, node, NavigationEvent.NAVIGATED));
+
+        NavigationEvent navigated = new NavigationEvent(this, node, NavigationEvent.NAVIGATED);
+        fireEvent(navigated);
+        node.fireEvent(navigated);
 
         EventHandler<PageCloseEvent> handler = event -> close(node);
         node.getProperties().put(PROPERTY_DIALOG_CLOSE_HANDLER, handler);
@@ -88,10 +95,13 @@ public class Navigator extends StackPane {
             throw new IllegalStateException();
         stack.pop();
         Node node = stack.peek();
+
         NavigationEvent navigating = new NavigationEvent(this, from, NavigationEvent.NAVIGATING);
         fireEvent(navigating);
         node.fireEvent(navigating);
+
         setContent(node);
+
         NavigationEvent navigated = new NavigationEvent(this, node, NavigationEvent.NAVIGATED);
         fireEvent(navigated);
         node.fireEvent(navigated);
diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties
index 671955f74..fef3eac52 100644
--- a/HMCL/src/main/resources/assets/lang/I18N.properties
+++ b/HMCL/src/main/resources/assets/lang/I18N.properties
@@ -55,7 +55,7 @@ account.methods.authlib_injector=authlib-injector
 account.methods.offline=Offline
 account.methods.yggdrasil=Mojang
 account.missing=No Account
-account.missing.add=Click the button on the right to add
+account.missing.add=Click here to add
 account.password=Password
 account.username=Name
 
diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties
index 650998fea..644809c3e 100644
--- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties
+++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties
@@ -55,7 +55,7 @@ account.methods.authlib_injector=authlib-injector 登入
 account.methods.offline=離線模式
 account.methods.yggdrasil=正版登入
 account.missing=沒有遊戲帳戶
-account.missing.add=點擊右邊按鈕添加
+account.missing.add=點擊此處添加帳戶
 account.password=密碼
 account.username=使用者名稱
 
diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
index 7fe9808fc..4dddd6c54 100644
--- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
+++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
@@ -55,7 +55,7 @@ account.methods.authlib_injector=外置登录 (authlib-injector)
 account.methods.offline=离线模式
 account.methods.yggdrasil=正版登录
 account.missing=没有游戏账户
-account.missing.add=点击右边按钮添加
+account.missing.add=点击此处添加账户
 account.password=密码
 account.username=用户名