diff --git a/src/command-line/config.js b/src/command-line/config.js
index 2385ef87..4080ff8f 100644
--- a/src/command-line/config.js
+++ b/src/command-line/config.js
@@ -10,7 +10,7 @@ program
 	.description("Edit config: '" + Helper.HOME + "/config.js'")
 	.action(function() {
 		child.spawn(
-			"vi",
+			process.env.EDITOR || "vi",
 			[Helper.HOME + "/config.js"],
 			{stdio: "inherit"}
 		);
diff --git a/src/command-line/edit.js b/src/command-line/edit.js
index 8bde2656..6330cd72 100644
--- a/src/command-line/edit.js
+++ b/src/command-line/edit.js
@@ -15,8 +15,8 @@ program
 			return;
 		}
 		child.spawn(
-			"vi",
-			[Helper.resolveHomePath("users", name, "user.json")],
+			process.env.EDITOR || "vi",
+			[require("path").join(Helper.HOME, "users", name, "user.json")],
 			{stdio: "inherit"}
 		);
 	});