diff --git a/octoprint/server.py b/octoprint/server.py
index e7639aa..2ee1314 100644
--- a/octoprint/server.py
+++ b/octoprint/server.py
@@ -470,7 +470,7 @@ def getSettings():
 
 	return jsonify({
 		"api": {
-			"allow": s.getBoolean(["api", "allow"]),
+			"enabled": s.getBoolean(["api", "enabled"]),
 			"key": s.get(["api", "key"])
 		},
 		"appearance": {
@@ -523,7 +523,7 @@ def setSettings():
 		s = settings()
 
 		if "api" in data.keys():
-			if "allow" in data["api"].keys(): s.set(["api", "allow"], data["api"]["allow"])
+			if "enabled" in data["api"].keys(): s.set(["api", "enabled"], data["api"]["enabled"])
 			if "key" in data["api"].keys(): s.set(["api", "key"], data["api"]["key"], True)
 
 		if "appearance" in data.keys():
diff --git a/octoprint/static/js/ui.js b/octoprint/static/js/ui.js
index 4b4d8ba..3c442dc 100644
--- a/octoprint/static/js/ui.js
+++ b/octoprint/static/js/ui.js
@@ -1310,7 +1310,7 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
     self.loginState = loginStateViewModel;
     self.users = usersViewModel;
 
-    self.api_allow = ko.observable(undefined);
+    self.api_enabled = ko.observable(undefined);
     self.api_key = ko.observable(undefined);
 
     self.appearance_name = ko.observable(undefined);
@@ -1365,8 +1365,8 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
     }
 
     self.fromResponse = function(response) {
-	self.api_allow(response.api.allow);
-	self.api_key(response.api.key);
+        self.api_enabled(response.api.enabled);
+        self.api_key(response.api.key);
 
         self.appearance_name(response.appearance.name);
         self.appearance_color(response.appearance.color);
@@ -1403,7 +1403,7 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
     self.saveData = function() {
         var data = {
             "api" : {
-                "allow": self.api_allow(),
+                "enabled": self.api_enabled(),
                 "key": self.api_key()
              },
             "appearance" : {
diff --git a/octoprint/templates/settings.jinja2 b/octoprint/templates/settings.jinja2
index 15f4f74..5d03bf6 100644
--- a/octoprint/templates/settings.jinja2
+++ b/octoprint/templates/settings.jinja2
@@ -224,12 +224,12 @@
                         <div class="control-group">
                             <div class="controls">
                                 <label class="checkbox">
-                                    <input type="checkbox" id="settings-apiallow" data-bind="checked: api_allow"> Allow
+                                    <input type="checkbox" id="settings-apiEnabled" data-bind="checked: api_enabled"> Enable
                                 </label>
                             </div>
                         </div>
                         <div class="control-group">
-                            <label class="control-label" for="settings-apikey">Apikey</label>
+                            <label class="control-label" for="settings-apiKey">Apikey</label>
                             <div class="controls">
                                 <input type="text" class="input-block-level" data-bind="value: api_key" id="settings-apikey">
                             </div>