diff --git a/tools/userClientTools.ts b/tools/userClientTools.ts
index 0e26b49b19e782b84235a6b8a322ec7cb6d3bf8c..0db1f3198fcf3c8095795d7b4b6cc9c566f5c809 100644
--- a/tools/userClientTools.ts
+++ b/tools/userClientTools.ts
@@ -5,6 +5,7 @@ import * as args from "command-line-args";
 import * as usage from "command-line-usage";
 import * as readline from "readline";
 import * as Bluebird from "bluebird";
+import * as process from "process";
 import {DiscordClientFactory} from "../src/clientfactory";
 
 import { DiscordBridgeConfig } from "../src/config";
@@ -79,16 +80,20 @@ Please enter your Discord Token
         rl.close();
         addUserToken(userid, token).then(() => {
           log.info("tool", "Completed successfully");
+          process.exit(0);
         }).catch((err) => {
           log.info("tool", "Failed to add, $s", err);
+          process.exit(1);
         });
       });
     } else if (options.remove) {
       rl.close();
       discordstore.delete_user_token(userid).then(() => {
         log.info("tool", "Completed successfully");
+        process.exit(0);
       }).catch((err) => {
         log.info("tool", "Failed to delete, $s", err);
+        process.exit(1);
       });
     }
   });