Index: HTML/ExBrowse3/setup.html
===================================================================
--- HTML/ExBrowse3/setup.html	(revision 8244)
+++ HTML/ExBrowse3/setup.html	(working copy)
@@ -22,7 +22,7 @@
  [% IF page == 'player' %] 
   <h3>[% "FORGET_PLAYER" | string %]</h3>
   <p>[% "FORGET_PLAYER_DESC" | string %]</p>
-  <p><a href="[% webroot %]home.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerURI %]">[% "FORGET_PLAYER_LINK" | string %]</a></p>
+  <p><a href="[% webroot %]home.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerid | uri %]">[% "FORGET_PLAYER_LINK" | string %]</a></p>
   <hr/>
  [% END %]
  [% IF versionInfo %]<p>[% versionInfo %]</p><hr/>[% END %]
Index: HTML/Touch/setup.html
===================================================================
--- HTML/Touch/setup.html	(revision 8244)
+++ HTML/Touch/setup.html	(working copy)
@@ -29,7 +29,7 @@
 [% IF page == 'player' %]
     <h3>[% "FORGET_PLAYER" | string %]</h3>
     <p>[% "FORGET_PLAYER_DESC" | string %]</p>
-    <p><a href="[% webroot %]home.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerURI %]">[% "FORGET_PLAYER_LINK" | string %]</a></p>
+    <p><a href="[% webroot %]home.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerid | uri %]">[% "FORGET_PLAYER_LINK" | string %]</a></p>
     <hr>
 [% END %]
 
Index: HTML/Moser/setup.html
===================================================================
--- HTML/Moser/setup.html	(revision 8244)
+++ HTML/Moser/setup.html	(working copy)
@@ -21,7 +21,7 @@
 [% IF page == 'player' %]
 		<h3>[% "FORGET_PLAYER" | string %]</h3>
 		<p>[% "FORGET_PLAYER_DESC" | string %]</p>
-		<p><a href="[% webroot %]home.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerURI %]">[% "FORGET_PLAYER_LINK" | string %]</a></p>
+		<p><a href="[% webroot %]home.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerid | uri %]">[% "FORGET_PLAYER_LINK" | string %]</a></p>
    <hr>
 [% END %]
     [% IF versionInfo %][% versionInfo %]<hr>[% END %]
Index: HTML/Nokia770/setup.html
===================================================================
--- HTML/Nokia770/setup.html	(revision 8244)
+++ HTML/Nokia770/setup.html	(working copy)
@@ -29,7 +29,7 @@
 [% IF page == 'player' %]
     <h3>[% "FORGET_PLAYER" | string %]</h3>
     <p>[% "FORGET_PLAYER_DESC" | string %]</p>
-    <p><a href="[% webroot %]home.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerURI %]">[% "FORGET_PLAYER_LINK" | string %]</a></p>
+    <p><a href="[% webroot %]home.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerid | uri %]">[% "FORGET_PLAYER_LINK" | string %]</a></p>
     <hr>
 [% END %]
 
Index: HTML/NBMU/setup.html
===================================================================
--- HTML/NBMU/setup.html	(revision 8244)
+++ HTML/NBMU/setup.html	(working copy)
@@ -41,7 +41,7 @@
       [% IF page == 'player' %] 
       <h3>[% "FORGET_PLAYER" | string %]</h3>
       <p>[% "FORGET_PLAYER_DESC" | string %]</p>
-      <p><a href="[% webroot %]home.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerURI %]">[% "FORGET_PLAYER_LINK" | string %]</a></p>
+      <p><a href="[% webroot %]home.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerid | uri %]">[% "FORGET_PLAYER_LINK" | string %]</a></p>
       <hr>
       [% END %] 
 [% IF versionInfo %][% versionInfo %]
Index: HTML/EN/setup.html
===================================================================
--- HTML/EN/setup.html	(revision 8244)
+++ HTML/EN/setup.html	(working copy)
@@ -21,7 +21,7 @@
   [% IF page == 'PLAYER_SETTINGS' %] 
   <div class="prefHead">[% "FORGET_PLAYER" | string %]</div>
   <div class="prefDesc">[% "FORGET_PLAYER_DESC" | string %]</div>
-  <p><a href="[% webroot %]index.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerURI %]" target="_top">[% "FORGET_PLAYER_LINK" | string %]</a></p>
+  <p><a href="[% webroot %]index.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerid | uri %]" target="_top">[% "FORGET_PLAYER_LINK" | string %]</a></p>
   <hr>
   [% END %] 
   [% IF versionInfo %]<p>[% versionInfo %]</p>[% END %]
Index: HTML/Default2/setup.html
===================================================================
--- HTML/Default2/setup.html	(revision 8244)
+++ HTML/Default2/setup.html	(working copy)
@@ -27,7 +27,7 @@
  [% IF page == 'player' %] 
   <h3>[% "FORGET_PLAYER" | string %]</h3>
   <p>[% "FORGET_PLAYER_DESC" | string %]</p>
-  <p><a href="[% webroot %]home.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerURI %]">[% "FORGET_PLAYER_LINK" | string %]</a></p>
+  <p><a href="[% webroot %]home.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerid | uri %]">[% "FORGET_PLAYER_LINK" | string %]</a></p>
   <hr/>
  [% END %]
  [% IF versionInfo %]<p>[% versionInfo %]</p>[% END %]
Index: HTML/Handheld/setup.html
===================================================================
--- HTML/Handheld/setup.html	(revision 8244)
+++ HTML/Handheld/setup.html	(working copy)
@@ -16,7 +16,7 @@
 	[% IF page == 'player' %]
 		<table bgcolor="[% subtitleC %]" width=100%><tr><td><h4>[% "FORGET_PLAYER" | string %]</h4></td></tr></table>
 		<p>[% "FORGET_PLAYER_DESC" | string %]</p>
-		<p><a href="[% webroot %]home.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerURI %]">[% "FORGET_PLAYER_LINK" | string %]</a></p>
+		<p><a href="[% webroot %]home.html?command=client&amp;subcommand=forget&amp;playerid=[% playerid | uri %]&amp;player=[% playerid | uri %]">[% "FORGET_PLAYER_LINK" | string %]</a></p>
 		<hr>
 	[% END %]