Index: bakery.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/bakery/bakery.module,v
retrieving revision 1.52.4.6
diff -u -p -r1.52.4.6 bakery.module
--- bakery.module	29 Oct 2010 17:44:36 -0000	1.52.4.6
+++ bakery.module	29 Oct 2010 20:33:44 -0000
@@ -238,14 +238,24 @@ function bakery_form_alter(&$form, $form
     case 'user_register':
       // Provide register ability on the slave sites.
       if (!variable_get('bakery_is_master', FALSE)) {
-        // Populate fields if set from previous attempt.
-        if (isset($_SESSION['bakery']['register'])) {
-          $form['account']['name']['#default_value'] = $_SESSION['bakery']['register']['name'];
-          $form['account']['mail']['#default_value'] = $_SESSION['bakery']['register']['mail'];
-          unset($_SESSION['bakery']['register']);
+        if (arg(0) == 'admin') {
+          // Admin create user form. Add a note about account synchronization.
+          $form['account']['bakery_help'] = array(
+            '#value' => t('<strong>Note:</strong> Only use this form to create accounts for users who exist on <a href="!url">@master</a> and not on this site. Be sure to use the exact same username and e-mail for the account here that they have on @master.', array('!url' => variable_get('bakery_master', 'http://drupal.org'), '@master' => variable_get('bakery_master', 'http://drupal.org'))),
+            '#weight' => -100,
+          );
+        }
+        else {
+          // Anonymous user registration form.
+          // Populate fields if set from previous attempt.
+          if (isset($_SESSION['bakery']['register'])) {
+            $form['account']['name']['#default_value'] = $_SESSION['bakery']['register']['name'];
+            $form['account']['mail']['#default_value'] = $_SESSION['bakery']['register']['mail'];
+            unset($_SESSION['bakery']['register']);
+          }
+          // Replace the submit handler with our own.
+          $form['#submit'] = array('_bakery_register_submit');
         }
-        // Replace the submit handler with our own.
-        $form['#submit'] = array('_bakery_register_submit');
       }
       break;
     case 'user_pass_reset':