diff --git a/server/server.js b/server/server.js
index fd206227..0dbec809 100755
--- a/server/server.js
+++ b/server/server.js
@@ -431,11 +431,12 @@ io.on('connection', function(socket){
 
   socket.on('shuffle', function(pass)
   {
-    if(pass !== undefined && pass !== null && pass != "")
+    if(pass !== undefined && pass !== null)
     {
       check_inlist(coll, guid, socket, name);
 
-      var hash = hash_pass(pass);
+      if(pass == "") var hash = pass;
+      else var hash = hash_pass(pass);
       db.collection(coll).find({views:{$exists:true}}, function(err, docs){
         if(docs !== null && docs.length != 0 && ((docs[0]["adminpass"] == hash || docs[0]["adminpass"] == "") || docs[0]["shuffle"] == false))
         {
diff --git a/static/js/admin.js b/static/js/admin.js
index a8de14aa..d858e42f 100755
--- a/static/js/admin.js
+++ b/static/js/admin.js
@@ -146,7 +146,8 @@ function remove_bar()
 
 function shuffle()
 {
-	socket.emit('shuffle', adminpass);
+	var pass_to_send = adminpass !== undefined ? adminpass : "";
+	socket.emit('shuffle', pass_to_send);
 }
 
 function rnd(arr)
diff --git a/static/js/youtube.js b/static/js/youtube.js
index 8a9947a0..693e8e93 100755
--- a/static/js/youtube.js
+++ b/static/js/youtube.js
@@ -85,8 +85,7 @@ $(document).ready(function()
 	};
 	img.crossOrigin = 'Anonymous';
 	img.src = 'http://img.youtube.com/vi/NuEfvIca0XU/mqdefault.jpg';
-	*/
-	
+*/
 	setup_youtube_listener(chan);
 	//Materialize.toast("Passwords have been reset. If anything is not right, please send us a mail @ contact@zoff.no", 10000);
 	$("#settings").sideNav({