diff --git a/package.json b/package.json
index 8621d69d..eec6f481 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "shout",
   "description": "A web IRC client",
-  "version": "0.10.5",
+  "version": "0.10.6",
   "author": "Mattias Erming",
   "preferGlobal": true,
   "bin": {
diff --git a/src/cli/config.js b/src/cli/config.js
index 365fbfcf..5b38ff07 100644
--- a/src/cli/config.js
+++ b/src/cli/config.js
@@ -7,7 +7,7 @@ program
 	.action(function() {
 		child.spawn(
 			"sudo",
-			["vim", process.cwd() + "/config.json"],
+			["vi", process.cwd() + "/config.json"],
 			{stdio: "inherit"}
 		);
 	});
diff --git a/src/cli/edit.js b/src/cli/edit.js
new file mode 100644
index 00000000..0fae792d
--- /dev/null
+++ b/src/cli/edit.js
@@ -0,0 +1,21 @@
+var ClientManager = new require("../clientManager");
+var program = require("commander");
+var child = require("child_process");
+
+program
+	.command("edit <name>")
+	.description("Edit existing user")
+	.action(function(name) {
+		var users = new ClientManager().getUsers();
+		if (users.indexOf(name) === -1) {
+			console.log("");
+			console.log("User '" + name + "' doesn't exist.");
+			console.log("");
+			return;
+		}
+		child.spawn(
+			"sudo",
+			["vi", process.cwd() + "/users/" + name + "/user.json"],
+			{stdio: "inherit"}
+		);
+	});
diff --git a/src/cli/index.js b/src/cli/index.js
index 4457847d..1eda8241 100644
--- a/src/cli/index.js
+++ b/src/cli/index.js
@@ -5,6 +5,7 @@ require("./config");
 require("./list");
 require("./add");
 require("./remove");
+require("./edit");
 
 program
 	.option("-p, --port <port>")
diff --git a/src/cli/remove.js b/src/cli/remove.js
index 54bc3771..394f3eb2 100644
--- a/src/cli/remove.js
+++ b/src/cli/remove.js
@@ -19,8 +19,7 @@ program
 			return;
 		}
 		var manager = new ClientManager();
-		var success = manager.removeUser(name);
-		if (success) {
+		if (manager.removeUser(name)) {
 			console.log("");
 			console.log("Removed '" + name + "'.");
 			console.log("");