diff --git a/app/src/main/java/com/limelight/GameMenu.java b/app/src/main/java/com/limelight/GameMenu.java
index cce2011cf..b2f68bb78 100755
--- a/app/src/main/java/com/limelight/GameMenu.java
+++ b/app/src/main/java/com/limelight/GameMenu.java
@@ -273,6 +273,9 @@ private void showAdvancedMenu() {
         options.add(new MenuOption(getString(R.string.game_menu_toggle_virtual_keyboard_model), true,
                 game::showHidekeyBoardLayoutController));
 
+        options.add(new MenuOption(getString(R.string.game_menu_task_manager), true,
+                () -> sendKeys(new short[]{KeyboardTranslator.VK_LCONTROL, KeyboardTranslator.VK_LSHIFT, KeyboardTranslator.VK_ESCAPE})));
+
         options.add(new MenuOption(getString(R.string.game_menu_send_keys), this::showSpecialKeysMenu));
 
         options.add(new MenuOption(getString(R.string.game_menu_switch_touch_sensitivity_model), true,
diff --git a/app/src/main/java/com/limelight/PcView.java b/app/src/main/java/com/limelight/PcView.java
index e05885e38..dc38b9449 100755
--- a/app/src/main/java/com/limelight/PcView.java
+++ b/app/src/main/java/com/limelight/PcView.java
@@ -542,7 +542,13 @@ private void doOTPPair(final ComputerDetails computer) {
         dialogBuilder.setTitle(R.string.pcview_menu_pair_pc_otp);
         dialogBuilder.setView(layout);
 
-        dialogBuilder.setPositiveButton(getString(R.string.proceed), (dialog, which) -> {
+        dialogBuilder.setPositiveButton(getString(R.string.proceed), null);
+
+        dialogBuilder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.dismiss());
+        AlertDialog dialog = dialogBuilder.create();
+        dialog.show();
+
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
             String pin = otpInput.getText().toString();
             String passphrase = passphraseInput.getText().toString();
             if (pin.length() != 4) {
@@ -554,10 +560,8 @@ private void doOTPPair(final ComputerDetails computer) {
                 return;
             }
             doPair(computer, pin, passphrase);
+            dialog.dismiss(); // Manually dismiss the dialog if the input is valid
         });
-
-        dialogBuilder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.dismiss());
-        dialogBuilder.create().show();
     }
 
     private void doWakeOnLan(final ComputerDetails computer) {
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 54bb448d1..f917575d3 100755
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -11,7 +11,7 @@
     <string name="help_loading_msg"> 正在加载帮助页面…… </string>
     <!-- PC view menu entries -->
     <string name="pcview_menu_app_list"> 浏览游戏列表 </string>
-    <string name="pcview_menu_pair_pc"> 和电脑配对 </string>
+    <string name="pcview_menu_pair_pc"> 普通配对 </string>
     <string name="pcview_menu_pair_pc_otp"> OTP配对 </string>
     <string name="pcview_menu_unpair_pc"> 取消配对 </string>
     <string name="pcview_menu_send_wol"> 发送 Wake-On-LAN 请求 </string>
@@ -27,7 +27,7 @@
     <string name="pair_pairing_msg"> 请在目标电脑上输入以下PIN码： </string>
     <string name="pair_otp_pairing_msg">正在配对，请稍候…</string>
     <string name="pair_otp_pairing_help">OTP 配对仅支持 Apollo，其他服务端请在 WebUI 上手动输入刚刚提供的PIN码。</string>
-    <string name="pair_incorrect_pin"> PIN码错误 </string>
+    <string name="pair_incorrect_pin"> PIN码或口令错误 </string>
     <string name="pair_fail"> 配对失败 </string>
     <string name="pair_already_in_progress"> 配对中，请稍候 </string>
     <string name="pair_passphrase_hint">口令</string>
@@ -314,6 +314,7 @@
     <string name="game_menu_switch_touch_sensitivity_model">触控灵敏度切换</string>
     <string name="game_menu_disconnect">断开连接</string>
     <string name="game_menu_cancel">取消</string>
+    <string name="game_menu_task_manager">打开任务管理器</string>
     <string name="game_menu_send_keys">发送特殊按键</string>
     <string name="game_menu_send_keys_ctrl_v">发送 Ctrl + V (粘贴剪切板)</string>
     <string name="game_menu_send_keys_win">发送 Win (打开Windows开始菜单)</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 43c6b8387..bd02a5a4f 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
     <string name="pcview_menu_header_offline">Offline</string>
     <string name="pcview_menu_header_unknown">Refreshing</string>
     <string name="pcview_menu_app_list">View All Apps</string>
-    <string name="pcview_menu_pair_pc">Pair with PC</string>
+    <string name="pcview_menu_pair_pc">Legacy Pair</string>
     <string name="pcview_menu_pair_pc_otp">OTP Pair</string>
     <string name="pcview_menu_unpair_pc">Unpair</string>
     <string name="pcview_menu_send_wol">Send Wake-On-LAN request</string>
@@ -45,7 +45,7 @@
     <string name="pair_pairing_help">If your host PC is running Sunshine, navigate to the Sunshine web UI to enter the PIN.</string>
     <string name="pair_otp_pairing_msg">Pairing, please wait…</string>
     <string name="pair_otp_pairing_help">OTP pairing is only available with Apollo, enter the PIN you just provided on the web UI manually if you\'re using other host software.</string>
-    <string name="pair_incorrect_pin">Incorrect PIN</string>
+    <string name="pair_incorrect_pin">Incorrect PIN or Passphrase</string>
     <string name="pair_fail">Pairing failed</string>
     <string name="pair_already_in_progress">Pairing already in progress</string>
     <string name="pair_passphrase_hint">Passphrase</string>
@@ -337,6 +337,7 @@
     <string name="game_menu_toggle_mouse_off">Disable Controller Mouse Emulation</string>
     <string name="game_menu_disconnect">Disconnect</string>
     <string name="game_menu_cancel">Cancel</string>
+    <string name="game_menu_task_manager">Open Task Manager</string>
     <string name="game_menu_send_keys">Send special keys</string>
     <string name="game_menu_send_keys_esc">Send ESC</string>
     <string name="game_menu_send_keys_f11">Send F11</string>