diff --git a/server/server.js b/server/server.js
index e83056f2..4631c744 100755
--- a/server/server.js
+++ b/server/server.js
@@ -165,7 +165,7 @@ io.on('connection', function(socket){
 
   socket.on('skip', function(list)
   {
-  	db.collection(coll).find({skip: true}, function(err, docs){
+  	db.collection(coll).find({skip: false}, function(err, docs){
   		if(docs.length == 1)
   		{
   			if(lists[coll].length/2 <= docs[0]["skips"]+1)
@@ -178,7 +178,7 @@ io.on('connection', function(socket){
   				});
   			}
   		}else
-        socket.emit("sucess_settings", "No Skipping!");
+        socket.emit("toast", "No Skipping!");
   	});
   });
 
diff --git a/static/js/admin.js b/static/js/admin.js
index ead77dca..036346d7 100755
--- a/static/js/admin.js
+++ b/static/js/admin.js
@@ -13,7 +13,7 @@ socket.on("toast", function(msg)
 
 socket.on(chan.toLowerCase()+",conf", function(msg)
 {
-	populate_list(msg);
+	populate_list(msg, true);
 });
 
 $('input[class=conf]').change(function()
diff --git a/static/js/list.js b/static/js/list.js
index 2ad906f7..335872ea 100755
--- a/static/js/list.js
+++ b/static/js/list.js
@@ -9,7 +9,7 @@ var list_html = $("#list-song-html").html();
 var hasadmin=0;
 
 socket.on(guid, function(msg){
-	populate_list(msg);
+	populate_list(msg, false);
 });
 
 socket.on("abc", function(){
@@ -17,7 +17,7 @@ socket.on("abc", function(){
 });
 
 socket.on(chan.toLowerCase(), function(msg){
-	populate_list(msg);
+	populate_list(msg, false);
 });
 
 socket.on("skipping", function(obj)
@@ -29,11 +29,12 @@ socket.on("skipping", function(obj)
 	},1500);
 });
 
-function populate_list(msg)
+function populate_list(msg, conf_only)
 {
 	console.log(msg);
-
-	$("#wrapper").empty();
+	console.log(conf_only);
+	if(!conf_only)
+		$("#wrapper").empty();
 
 		$.each(msg, function(j, listeID){
 			if(listeID.hasOwnProperty('startTime')) //check if its config part of list