diff --git a/src/command-line/edit.js b/src/command-line/edit.js
index 6330cd72..70f1ebc3 100644
--- a/src/command-line/edit.js
+++ b/src/command-line/edit.js
@@ -5,7 +5,7 @@ var Helper = require("../helper");
 
 program
 	.command("edit <name>")
-	.description("Edit user: '" + Helper.HOME + "/users/<name>/user.json'")
+	.description("Edit user: '" + Helper.HOME + "/users/<name>.json'")
 	.action(function(name) {
 		var users = new ClientManager().getUsers();
 		if (users.indexOf(name) === -1) {
@@ -16,7 +16,7 @@ program
 		}
 		child.spawn(
 			process.env.EDITOR || "vi",
-			[require("path").join(Helper.HOME, "users", name, "user.json")],
+			[require("path").join(Helper.HOME, "users", name + ".json")],
 			{stdio: "inherit"}
 		);
 	});
diff --git a/src/command-line/reset.js b/src/command-line/reset.js
index 5f373c4b..89f0157c 100644
--- a/src/command-line/reset.js
+++ b/src/command-line/reset.js
@@ -15,7 +15,7 @@ program
 			console.log("");
 			return;
 		}
-		var file = Helper.HOME + "/users/" + name + "/user.json";
+		var file = Helper.HOME + "/users/" + name + ".json";
 		var user = require(file);
 		require("read")({
 			prompt: "Password: ",