Index: HTML/Fishbone/html/scripts.js
===================================================================
--- HTML/Fishbone/html/scripts.js	(revision 4661)
+++ HTML/Fishbone/html/scripts.js	(working copy)
@@ -6,8 +6,13 @@
 	parent.playlist.location="playlist.html?player=" + newPlayer;
 	parent.header.location.reload(false);
 	window.location="status.html?player=" + newPlayer;
-	
-	newHref(parent.browser.document,newPlayer);
+	if (parent.browser.location.href.indexOf('setup') == -1) {
+		newHref(parent.browser.document,newPlayer);
+	} else {
+		myString = new String(parent.browser.location.href);
+		var rExp = /(\w\w(:|%3A)){5}(\w\w)/gi;
+		parent.browser.location=myString.replace(rExp, newPlayer);
+	}
 }
 
 function newHref(doc,plyr) {
Index: HTML/EN/html/common.js
===================================================================
--- HTML/EN/html/common.js	(revision 4661)
+++ HTML/EN/html/common.js	(working copy)
@@ -31,13 +31,18 @@
 	var newPlayer = player_List.options[player_List.selectedIndex].value;
 	parent.playlist.location="playlist.html?player="+newPlayer;
 	window.location="status_header.html?player="+newPlayer;
-	
-	for (var j=0;j < parent.browser.document.links.length; j++) {
-		var myString = new String(parent.browser.document.links[j].href);
-		var rString = newPlayer;
+	if (parent.browser.location.href.indexOf('setup') == -1) {
+		for (var j=0;j < parent.browser.document.links.length; j++) {
+			var myString = new String(parent.browser.document.links[j].href);
+			var rString = newPlayer;
+			var rExp = /(\w\w(:|%3A)){5}(\w\w)/gi;
+		
+			parent.browser.document.links[j].href = myString.replace(rExp, rString);
+		}
+	} else {
+		myString = new String(parent.browser.location.href);
 		var rExp = /(\w\w(:|%3A)){5}(\w\w)/gi;
-	
-		parent.browser.document.links[j].href = myString.replace(rExp, rString);
+		parent.browser.location=myString.replace(rExp, newPlayer);
 	}
 }