Index: D:/eclipse/svn/Slim/Utils/Prefs.pm
===================================================================
--- D:/eclipse/svn/Slim/Utils/Prefs.pm	(revision 5556)
+++ D:/eclipse/svn/Slim/Utils/Prefs.pm	(working copy)
@@ -675,10 +675,6 @@
 	
 	my $oldvalue;
 
-	# We always want to write out just bytes to the pref file, so turn off
-	# the UTF8 flag.
-	$value = Slim::Utils::Unicode::utf8off($value);
-
 	if (defined $ind) {
 
 		if (defined $prefs->{$key}) {
Index: D:/eclipse/svn/Slim/Web/HTTP.pm
===================================================================
--- D:/eclipse/svn/Slim/Web/HTTP.pm	(revision 5556)
+++ D:/eclipse/svn/Slim/Web/HTTP.pm	(working copy)
@@ -378,7 +378,11 @@
 					# string with the appropriate magic set.
 					if ($value ne '*' && $value ne '') {
 
-						$value = Slim::Utils::Unicode::utf8decode($value);
+						if ($] > 5.007) {
+							$value = Slim::Utils::Unicode::utf8decode($value, 'utf8');
+						} else {
+							$value = Slim::Utils::Unicode::utf8decode($value);
+						}
 					}
 
 					$params->{$name} = $value;