Index: C:/slim/boom/server/Slim/Control/Commands.pm
===================================================================
--- C:/slim/boom/server/Slim/Control/Commands.pm	(revision 20426)
+++ C:/slim/boom/server/Slim/Control/Commands.pm	(working copy)
@@ -1408,7 +1410,17 @@
 
 	} else {
 
+		my $playalbum = $prefs->client($client)->get('playtrackalbum');
+			
+		# if player pref for playtrack album is not set, get the old server pref.
+		if (!defined $playalbum) { $playalbum = $prefs->get('playtrackalbum'); }
+
 		@tracks = _playlistXtracksCommand_parseSearchTerms($client, $what);
+		
+		if ($playalbum) {
+			$jumpToIndex = $tracks[0]->tracknum - 1;
+			@tracks = _playlistXtracksCommand_parseDbItem($client,"db:album.id=".$tracks[0]->album->id);
+		}
 	}
 
 	my $size  = scalar(@tracks);
@@ -1431,7 +1443,7 @@
 		Slim::Player::Playlist::reshuffle($client, $load ? 1 : undef);
 	}
 
-	if ($load) {
+	if ($load || $jumpToIndex) {
 		# The user may have stopped in the middle of a
 		# saved playlist - resume if we can. Bug 1582
 		my $playlistObj = $client->currentPlaylist();