diff --git a/channel.js b/channel.js
index a0f177b8..4e255e59 100644
--- a/channel.js
+++ b/channel.js
@@ -42,6 +42,8 @@ var Channel = function(name) {
     this.poll = false;
     this.voteskip = false;
     this.opts = {
+        qopen_allow_anon: false,
+        qopen_allow_guest: true,
         qopen_allow_qnext: false,
         qopen_allow_move: false,
         qopen_allow_playnext: false,
@@ -793,9 +795,14 @@ Channel.prototype.enqueue = function(data, user) {
 }
 
 Channel.prototype.tryQueue = function(user, data) {
-    if(!Rank.hasPermission(user, "queue") &&
-            this.leader != user &&
-            !this.openqueue) {
+    var anon = (user.name == "");
+    var guest = (user.name != "" && !user.loggedIn);
+    var canqueue = (anon && this.opts.qopen_allow_anon) ||
+                   (guest && this.opts.qopen_allow_guest) ||
+                   (!anon && !guest);
+    canqueue = canqueue && this.openqueue;
+    canqueue = canqueue || this.leader == user || Rank.hasPermission(user, "queue");
+    if(!canqueue) {
         return;
     }
     if(data.pos == undefined || data.id == undefined) {
diff --git a/package.json b/package.json
index d45d93a0..ac15f600 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "author": "Calvin Montgomery",
     "name": "CyTube",
     "description": "Online media synchronizer and chat",
-    "version": "1.8.0",
+    "version": "1.8.1",
     "repository": {
         "url": "http://github.com/calzoneman/sync"
     },
diff --git a/server.js b/server.js
index 6c5396fe..35c633ec 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.8.0";
+const VERSION = "1.8.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 585ad747..b3e89455 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -182,6 +182,8 @@ Callbacks = {
     },
 
     channelOpts: function(opts) {
+        $("#opt_qopen_allow_anon").prop("checked", opts.qopen_allow_anon);
+        $("#opt_qopen_allow_guest").prop("checked", opts.qopen_allow_guest);
         $("#opt_qopen_allow_qnext").prop("checked", opts.qopen_allow_qnext);
         $("#opt_qopen_allow_move").prop("checked", opts.qopen_allow_move);
         $("#opt_qopen_allow_delete").prop("checked", opts.qopen_allow_delete);
@@ -226,7 +228,7 @@ Callbacks = {
             $("#voteskip").attr("disabled", false);
         else
             $("#voteskip").attr("disabled", true);
-        rebuildPlaylist();
+        handleRankChange();
     },
 
     channelCSSJS: function(data) {
diff --git a/www/assets/js/client.js b/www/assets/js/client.js
index fcd02d9f..0d5dfb70 100644
--- a/www/assets/js/client.js
+++ b/www/assets/js/client.js
@@ -346,6 +346,8 @@ $("#opt_submit").click(function() {
     var css = $("#opt_customcss").val();
     var ratio = +$("#opt_voteskip_ratio").val() || 0.5;
     opts = {
+        qopen_allow_anon: $("#opt_qopen_allow_anon").prop("checked"),
+        qopen_allow_guest: $("#opt_qopen_allow_guest").prop("checked"),
         qopen_allow_qnext: $("#opt_qopen_allow_qnext").prop("checked"),
         qopen_allow_move: $("#opt_qopen_allow_move").prop("checked"),
         qopen_allow_delete: $("#opt_qopen_allow_delete").prop("checked"),
diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js
index cd00bec6..671be919 100644
--- a/www/assets/js/functions.js
+++ b/www/assets/js/functions.js
@@ -387,7 +387,7 @@ function addQueueButtons(li) {
 function rebuildPlaylist() {
     $("#queue li").each(function() {
         $(this).find(".btn-group").remove();
-        if(RANK >= Rank.Moderator || LEADER || OPENQUEUE)
+        if(RANK >= Rank.Moderator || LEADER || canQueue())
             addQueueButtons(this);
     });
 }
@@ -599,24 +599,28 @@ function closePoll() {
     }
 }
 
+function canQueue() {
+    var anon = !uname;
+    var guest = (uname && !session);
+    var canqueue = (!guest && !anon) ||
+                   (guest && CHANNELOPTS.qopen_allow_guest) ||
+                   (anon && CHANNELOPTS.qopen_allow_anon);
+    canqueue = canqueue && OPENQUEUE;
+    return canqueue;
+}
+
 function handleRankChange() {
     rebuildPlaylist();
-    if(RANK >= Rank.Moderator || LEADER) {
-        $("#playlist_controls").css("display", "block");
-        $("#playlist_controls button").each(function() {
-            $(this).attr("disabled", false);
-        });
-        $("#pollcontainer .active").each(function() {
-            var btns = $(this).find(".btn-danger");
-            if(btns.length == 0) {
-                $("<button/>").addClass("btn btn-danger pull-right")
-                    .text("End Poll")
-                    .insertAfter($(this).find(".close"))
-                    .click(function() {
-                        socket.emit("closePoll")
-                    });
-            }
-        });
+    if(RANK >= 10) {
+        $("#drop_channel").parent().css("display", "");
+    }
+    if(RANK >= Rank.Owner) {
+        $("#show_jseditor").parent().css("display", "");
+        $("#show_csseditor").parent().css("display", "");
+    }
+    else {
+        $("#show_jseditor").parent().css("display", "none");
+        $("#show_csseditor").parent().css("display", "none");
     }
     if(RANK >= Rank.Moderator) {
         $("#qlockbtn").css("display", "block");
@@ -640,40 +644,47 @@ function handleRankChange() {
         $("#show_filtereditor").attr("disabled", val);
         $("#show_acl").attr("disabled", val);
     }
-    else if(!LEADER) {
-        if(OPENQUEUE) {
-            if(CHANNELOPTS.qopen_allow_qnext)
-                $("#queue_next").attr("disabled", false);
-            else
-                $("#queue_next").attr("disabled", true);
-            if(CHANNELOPTS.qopen_allow_playnext)
-                $("#play_next").attr("disabled", false);
-            else
-                $("#play_next").attr("disabled", true);
-        }
-        else {
-            $("#playlist_controls").css("display", "none");
-        }
+    else {
+        if(!LEADER) {
+            if(canQueue()) {
+                $("#playlist_controls").css("display", "");
+                if(CHANNELOPTS.qopen_allow_qnext)
+                    $("#queue_next").attr("disabled", false);
+                else
+                    $("#queue_next").attr("disabled", true);
+                if(CHANNELOPTS.qopen_allow_playnext)
+                    $("#play_next").attr("disabled", false);
+                else
+                    $("#play_next").attr("disabled", true);
+            }
+            else {
+                $("#playlist_controls").css("display", "none");
+            }
 
-        $("#pollcontainer .active").each(function() {
-            $(this).find(".btn-danger").remove();
-        });
-    }
-    if(RANK < Rank.Moderator) {
+            $("#pollcontainer .active").each(function() {
+                $(this).find(".btn-danger").remove();
+            });
+        }
         $("#getplaylist").css("width", "100%");
         $("#clearplaylist").css("display", "none");
         $("#shuffleplaylist").css("display", "none");
     }
-    if(RANK >= Rank.Owner) {
-        $("#show_jseditor").parent().css("display", "");
-        $("#show_csseditor").parent().css("display", "");
-    }
-    else {
-        $("#show_jseditor").parent().css("display", "none");
-        $("#show_csseditor").parent().css("display", "none");
-    }
-    if(RANK >= 10) {
-        $("#drop_channel").parent().css("display", "");
+    if(RANK >= Rank.Moderator || LEADER) {
+        $("#playlist_controls").css("display", "block");
+        $("#playlist_controls button").each(function() {
+            $(this).attr("disabled", false);
+        });
+        $("#pollcontainer .active").each(function() {
+            var btns = $(this).find(".btn-danger");
+            if(btns.length == 0) {
+                $("<button/>").addClass("btn btn-danger pull-right")
+                    .text("End Poll")
+                    .insertAfter($(this).find(".close"))
+                    .click(function() {
+                        socket.emit("closePoll")
+                    });
+            }
+        });
     }
 }
 
diff --git a/www/channel.html b/www/channel.html
index f01d5d72..23d86e56 100644
--- a/www/channel.html
+++ b/www/channel.html
@@ -160,6 +160,14 @@
                     <fieldset>
                         <div class="span5">
                             <label>When the queue is open:</label>
+                            <label class="checkbox">
+                                <input type="checkbox" id="opt_qopen_allow_anon">
+                                Allow anonymous users to add videos
+                            </label>
+                            <label class="checkbox">
+                                <input type="checkbox" id="opt_qopen_allow_guest">
+                                Allow guest users to add videos
+                            </label>
                             <label class="checkbox">
                                 <input type="checkbox" id="opt_qopen_allow_qnext">
                                 Allow anyone to Queue Next