diff --git a/package.json b/package.json
index 34fb113e..ba425879 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "author": "Calvin Montgomery",
     "name": "CyTube",
     "description": "Online media synchronizer and chat",
-    "version": "1.9.0",
+    "version": "1.9.1",
     "repository": {
         "url": "http://github.com/calzoneman/sync"
     },
diff --git a/server.js b/server.js
index 3a30f4ba..f196fb0b 100644
--- a/server.js
+++ b/server.js
@@ -9,7 +9,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-const VERSION = "1.9.0";
+const VERSION = "1.9.1";
 
 var fs = require("fs");
 var Logger = require("./logger.js");
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 4175e5df..f75c83a3 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -699,7 +699,7 @@ Callbacks = {
         $("<button/>").addClass("close pull-right").text("×")
             .appendTo(poll)
             .click(function() { poll.remove(); });
-        if(RANK >= Rank.Moderator || LEADER) {
+        if(hasPermission("pollctl")) {
             $("<button/>").addClass("btn btn-danger pull-right").text("End Poll")
                 .appendTo(poll)
                 .click(function() {
@@ -723,6 +723,8 @@ Callbacks = {
                 .click(callback);
 
         }
+
+        poll.find(".btn").attr("disabled", !hasPermission("pollvote"));
     },
 
     updatePoll: function(data) {
diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js
index 220d713c..93bd2449 100644
--- a/www/assets/js/functions.js
+++ b/www/assets/js/functions.js
@@ -808,7 +808,7 @@ function handlePermissionChange() {
     }
     var poll = $("#pollcontainer .active");
     if(poll.length > 0) {
-        poll.find(".btn").attr("disabled", hasPermission("pollvote"));
+        poll.find(".btn").attr("disabled", !hasPermission("pollvote"));
     }
     var users = $("#userlist").children();
     for(var i = 0; i < users.length; i++) {