diff --git a/config/default-settings.json b/config/default-settings.json
index 1dd56b2..aa914b1 100644
--- a/config/default-settings.json
+++ b/config/default-settings.json
@@ -21,5 +21,6 @@
   "player-list-text": {
     "header":"Flying squid",
     "footer":"Test server"
-  }
+  },
+  "everybody-op":true
 }
diff --git a/doc/API.md b/doc/API.md
index 26d7509..afc49f3 100644
--- a/doc/API.md
+++ b/doc/API.md
@@ -230,6 +230,7 @@ Options is an object containing the following properties:
 * plugins
 * view-distance
 * player-list-text : an object with keys header and footer, displayed on the player list
+* everybody-op : true or false, makes everybody op
 
 ### Properties
 
diff --git a/src/lib/plugins/login.js b/src/lib/plugins/login.js
index b4ba712..869a085 100644
--- a/src/lib/plugins/login.js
+++ b/src/lib/plugins/login.js
@@ -32,7 +32,7 @@ module.exports.server=function(serv,options)
   });
 };
 
-module.exports.player=function(player,serv)
+module.exports.player=function(player,serv,settings)
 {
   function addPlayer()
   {
@@ -40,7 +40,7 @@ module.exports.player=function(player,serv)
     player.health = 20;
     player.food = 20;
     player.crouching = false; // Needs added in prismarine-entity later
-    player.op = true; // REMOVE THIS WHEN OUT OF TESTING
+    player.op = settings["everybody-op"]; // REMOVE THIS WHEN OUT OF TESTING
     player.username=player._client.username;
     serv.players.push(player);
     serv.uuidToPlayer[player._client.uuid] = player;