--- Prefs.pm	2005-08-31 05:38:00.000000000 -0700
+++ Slim/Utils/Prefs.pm	2005-09-07 12:42:40.828125000 -0700
@@ -203,14 +203,6 @@ sub init {
 			},
 		},
 
-		'language' => sub {
-			my $newvalue = shift;
-
-			Slim::Buttons::Plugins::clearGroups();
-			Slim::Web::Setup::initSetup();
-			Slim::Music::Import::resetSetupGroups();
-		},
-
 		'checkVersion' => sub {
 			my $newValue = shift;
 			if ($newValue) {
--- Setup.pm	2005-09-06 06:01:00.000000000 -0700
+++ Slim/Web/Setup.pm	2005-09-07 13:09:20.328125000 -0700
@@ -1185,9 +1185,11 @@ sub initSetupConfig {
 				'validateArgs' => [\&Slim::Utils::Strings::hash_of_languages],
 				'options'      => undef,  # filled by initSetup using Slim::Utils::Strings::hash_of_languages()
 				'onChange'     => sub {
+					Slim::Buttons::Plugins::clearGroups();
 					Slim::Utils::Strings::init();
-					Slim::Buttons::Plugins::initPlugins();
 					Slim::Web::Setup::initSetup();
+					Slim::Buttons::Plugins::initPlugins();
+					Slim::Music::Import::resetSetupGroups();
 				},
 			},
 
--- Plugins.pm	2005-09-05 17:04:00.000000000 -0700
+++ Slim/Buttons/Plugins.pm	2005-09-07 13:09:06.765625000 -0700
@@ -371,6 +371,7 @@ sub clearGroups {
 	$::d_plugins && msg("Resetting plugins\n");
 	$addGroups = 0;
 	$plugins_read = 0;
+	%plugins = {};
 }
 
 sub addSetupGroups {