--- slimserver.pl.orig	2011-08-19 15:53:54.805580000 +0200
+++ slimserver.pl	2011-08-22 02:24:30.833156575 +0200
@@ -422,7 +422,7 @@
 	$failsafe ? $prefs->set('failsafe', 1) : $prefs->remove('failsafe');
 
 	# Change UID/GID after the pid & logfiles have been opened.
-	unless (Slim::Utils::OSDetect::getOS->dontSetUserAndGroup() || defined($user) eq "root") {
+	unless (Slim::Utils::OSDetect::getOS->dontSetUserAndGroup() || defined($user) eq "root" || (defined($user) && $user eq getpwuid($>)) ) {
 		main::INFOLOG && $log->info("Squeezebox Server settings effective user and group if requested...");
 		changeEffectiveUserAndGroup();		
 	}