Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.202
diff -u -p -r1.202 locale.module
--- modules/locale/locale.module	26 Nov 2007 22:34:09 -0000	1.202
+++ modules/locale/locale.module	7 Dec 2007 21:01:14 -0000
@@ -196,7 +196,7 @@ function locale_user($type, $edit, &$use
 
   // If we have more then one language and either creating a user on the
   // admin interface or edit the user, show the language selector.
-  if (variable_get('language_count', 1) > 1 && ($type == 'register' && user_access('administer users') || $type == 'form' && $category == 'account' )) {
+  if (variable_get('language_count', 1) > 1 && ($type == 'register' && user_access('administer users') || $type == 'form' && $category == 'account' && variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE) == LANGUAGE_NEGOTIATION_PATH )) {
     $languages = language_list('enabled');
     $languages = $languages['1'];