Index: Slim/Web/Settings.pm
===================================================================
--- Slim/Web/Settings.pm	(revision 13367)
+++ Slim/Web/Settings.pm	(working copy)
@@ -182,8 +182,9 @@
 	$paramRef->{'additionalLinks'} = \%Slim::Web::Pages::additionalLinks;
 
 	if (defined $client) {
-		$paramRef->{'playername'} = $client->name();
-		$paramRef->{'hasdisplay'} = !$client->display->isa('Slim::Display::NoDisplay');
+		$paramRef->{'playername'}  = $client->name();
+		$paramRef->{'needsClient'} = $class->needsClient();
+		$paramRef->{'hasdisplay'}  = !$client->display->isa('Slim::Display::NoDisplay');
 	}
 
 	return Slim::Web::HTTP::filltemplatefile($paramRef->{'useAJAX'} ? 'settings/ajaxSettings.txt' : $class->page, $paramRef);
Index: HTML/EN/settings/server/status.html
===================================================================
--- HTML/EN/settings/server/status.html	(revision 13367)
+++ HTML/EN/settings/server/status.html	(working copy)
@@ -59,5 +59,5 @@
 	</div>
 	[% END %]
 </div>
-	
+
 [% PROCESS settings/footer.html %]
Index: HTML/EN/settings/header.html
===================================================================
--- HTML/EN/settings/header.html	(revision 13367)
+++ HTML/EN/settings/header.html	(working copy)
@@ -26,7 +26,7 @@
  	
 [% END %]
 
-[% IF playerid; pagetitle='PLAYER_SETTINGS' | string; ELSE; pagetitle = 'SERVER_SETTINGS' | string; END %]
+[% IF playerid && needsClient; pagetitle='PLAYER_SETTINGS' | string; ELSE; pagetitle = 'SERVER_SETTINGS' | string; END %]
 [% pageicon = 'settings'; noSpacer = 1; PROCESS pageheader.html %]
 
 <div id="statusarea" class="statusarea">
@@ -44,7 +44,7 @@
 [% END %]
 	<input type=hidden value="0" name="useAJAX">
 	<input type=hidden value="[% page %]" name="page">
-	[% IF playerid %]<input type=hidden value="[% playerid %]" name="playerid">[% END %]
+	[% IF playerid && needsClient %]<input type=hidden value="[% playerid %]" name="playerid">[% END %]
 	[% IF player %]<input type=hidden value="[% player %]" name="player">[% END %]
 
 <!-- End settingsheader.html -->
Index: HTML/EN/setting_chooser.html
===================================================================
--- HTML/EN/setting_chooser.html	(revision 13367)
+++ HTML/EN/setting_chooser.html	(working copy)
@@ -1,6 +1,5 @@
 [% IF useTabList %]
-
-    [% IF playerid %][% links = playersetup %][% ELSE %][% links = additionalLinks.setup %][% END %]
+    [% IF playerid && needsClient%][% links = playersetup %][% ELSE %][% links = additionalLinks.setup %][% END %]
     [% IF links %]
       [% IF style == "list" %]<div id="setuptabs"><ul>[% END %]
       [% FOREACH link = links %]
@@ -26,7 +25,7 @@
 <input type="hidden" name="pageAntiCSRFToken" value="[% pageAntiCSRFToken %]">
 	<select ID="choose_setting" NAME="choose_setting" class="stdedit" style="width:17em;" onchange="chooseSettings(selectedIndex,options[selectedIndex].value)">
 		[% UNLESS setting_chooser_noHome %]<option [% IF page == "HOME" %]selected[% END %] value="HOME" label="[% "HOME" | string %]">[% "HOME" | string %]</option>[% END %]
-		[% IF playerid %][% PROCESS addSetupLinks setuplinks= playersetup %]
+		[% IF playerid && needsClient %][% PROCESS addSetupLinks setuplinks= playersetup %]
 		[% ELSE %][% PROCESS addSetupLinks  setuplinks=additionalLinks.setup %][% END %]
 	</select>
 	<input type=hidden value="[% page %]" name="page">