diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 326e365..a4d22fc 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -54,13 +54,22 @@ async fn parse_args(inp: &Vec<String>) -> Result<Args, ArgsError> {
     "no-admin",
     "Launch without requiring admin permissions",
   );
-  args.flag("g", "no-gui", "Run in CLI mode");
+  args.flag(
+    "g",
+    "no-gui",
+    "Run in CLI mode. Requires -A to be passed as well.",
+  );
   args.flag("s", "server", "Launch the configured GC server");
   args.flag(
     "P",
     "patch",
     "Patch your game before launching, with whatever your game version needs",
   );
+  args.flag(
+    "N",
+    "non-elevated-game",
+    "Launch the game without admin permissions",
+  );
   args.option(
     "H",
     "host",
@@ -96,16 +105,27 @@ async fn parse_args(inp: &Vec<String>) -> Result<Args, ArgsError> {
       patch::patch_game().await;
     }
 
-    system_helpers::run_program(game_path.to_string(), Some(game_args))
+    if args.value_of("non-elevated-game")? {
+      system_helpers::run_un_elevated(game_path.to_string(), Some(game_args))
+    } else {
+      system_helpers::run_program(game_path.to_string(), Some(game_args))
+    }
   }
 
   if args.value_of("server")? {
     let server_jar = config.grasscutter_path;
     let mut server_path = server_jar.clone();
+    // Strip jar name from path
+    if server_path.contains('/') {
+      // Can never panic because of if
+      let len = server_jar.rfind('/').unwrap();
+      server_path.truncate(len);
+    } else if server_path.contains('\\') {
+      let len = server_jar.rfind('\\').unwrap();
+      server_path.truncate(len);
+    }
     let java_path = config.java_path;
 
-    server_path.pop();
-
     system_helpers::run_jar(server_jar, server_path.to_string(), java_path);
   }
 
@@ -151,6 +171,7 @@ fn main() -> Result<(), ArgsError> {
   // For disabled GUI
   ctrlc::set_handler(|| {
     disconnect();
+    block_on(patch::unpatch_game());
     std::process::exit(0);
   })
   .unwrap_or(());
diff --git a/src-tauri/src/system_helpers.rs b/src-tauri/src/system_helpers.rs
index 7d09fa9..ff8bddf 100644
--- a/src-tauri/src/system_helpers.rs
+++ b/src-tauri/src/system_helpers.rs
@@ -11,7 +11,13 @@ use registry::{Data, Hive, Security};
 #[tauri::command]
 pub fn run_program(path: String, args: Option<String>) {
   // Without unwrap_or, this can crash when UAC prompt is denied
-  open::that(format!("{} {}", &path, &args.unwrap_or_else(|| "".into()))).unwrap_or(());
+  match open::with(
+    format!("{} {}", path, args.unwrap_or_else(|| "".into())),
+    path.clone(),
+  ) {
+    Ok(_) => (),
+    Err(e) => println!("Failed to open program ({}): {}", &path, e),
+  };
 }
 
 #[tauri::command]
@@ -80,12 +86,13 @@ pub fn run_jar(path: String, execute_in: String, java_path: String) {
 }
 
 #[tauri::command]
-pub fn run_un_elevated(path: String) {
+pub fn run_un_elevated(path: String, args: Option<String>) {
   // Open the program non-elevated.
   match open::with(
     format!(
-      "cmd /min /C \"set __COMPAT_LAYER=RUNASINVOKER && start \"\" \"{}\"\"",
-      path
+      "cmd /min /C \"set __COMPAT_LAYER=RUNASINVOKER && start \"\" \"{}\"\" {}",
+      path,
+      args.unwrap_or_else(|| "".into())
     ),
     "C:\\Windows\\System32\\cmd.exe",
   ) {