diff --git a/server/server.js b/server/server.js
index b2b2372c..19d6f3d0 100755
--- a/server/server.js
+++ b/server/server.js
@@ -42,12 +42,12 @@ io.on('connection', function(socket){
           if(name != "system.indexes")
           {
             db.collection(name).find({views:{$exists:true}}, function(err, conf){
-              db.collection(name).count(function(err, num){
-                db.collection(name).find({now_playing:true}, function(err, np){
-                  complete(np, i, colNames.length-2, name, num-1, conf);
-                  i++;
+                db.collection(name).count(function(err, num){
+                  db.collection(name).find({now_playing:true}, function(err, np){
+                    complete(np, i, colNames.length-2, name, num-1, conf);
+                    i++;
+                  });
                 });
-              });
             });
           }
       });
diff --git a/static/js/admin.js b/static/js/admin.js
index ab6f109e..a30a16ad 100755
--- a/static/js/admin.js
+++ b/static/js/admin.js
@@ -1,4 +1,3 @@
-var adminTogg = false;
 var pass_corr = "";
 
 
@@ -86,6 +85,7 @@ function log_out(){
 		}
 		$("#admin-lock").addClass("mdi-action-lock");
 		$("#admin-lock").removeClass("mdi-action-lock-open clickable");
+		$(".card-action").addClass("hide");
 		document.getElementById("password").value = "";
 		Materialize.toast("Logged out", 4000);
 	}else{
diff --git a/static/js/list.js b/static/js/list.js
index 5f1e2ea4..2dd8bd57 100755
--- a/static/js/list.js
+++ b/static/js/list.js
@@ -37,18 +37,16 @@ function populate_list(msg, conf_only)
 			if(listeID.hasOwnProperty('startTime')) //check if its config part of list
 			{
 				console.log("startTime");
-				if(!adminTogg)
-				{
-					if(listeID['adminpass'] == "" || w_p == false) hasadmin = false;
-					else hasadmin = true;
-					music = listeID["allvideos"];
-					longsongs = listeID["longsongs"];
-					names=["vote","addsongs","longsongs","frontpage", "allvideos", "removeplay", "skip", "shuffle"];
-					for (var i = 0; i < names.length; i++) {
-						document.getElementsByName(names[i])[0].checked = (listeID[names[i]] === true);
-						if(hasadmin)
-							$("input[name="+names[i]+"]").attr("disabled", true);
-					}
+				if(listeID['adminpass'] == "" || w_p == false) hasadmin = false;
+				else hasadmin = true;
+				music = listeID["allvideos"];
+				longsongs = listeID["longsongs"];
+				names=["vote","addsongs","longsongs","frontpage", "allvideos", "removeplay", "skip", "shuffle"];
+				for (var i = 0; i < names.length; i++) {
+					document.getElementsByName(names[i])[0].checked = (listeID[names[i]] === true);
+					if(hasadmin)
+						$("input[name="+names[i]+"]").attr("disabled", true);
+
 
 					/*if(hasadmin)
 						$("#setpass").text("Channel has admin");