Index: domain.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.module,v
retrieving revision 1.134.2.42
diff -u -p -r1.134.2.42 domain.module
--- domain.module	27 Jan 2011 23:17:48 -0000	1.134.2.42
+++ domain.module	27 Jan 2011 23:33:06 -0000
@@ -1835,7 +1835,14 @@ function domain_form_alter(&$form, &$for
               $user_domains[] = $value;
             }
           }
-          $first_domain = current($user_domains);
+          // Set the best match for the user's primary domain.
+          // If they are a member of the current domain, use that one.
+          if (in_array($_domain['domain_id'], $user_domains)) {
+            $first_domain = $_domain['domain_id'];
+          }
+          else {
+            $first_domain = current($user_domains);
+          }
           foreach ($options as $key => $value) {
             if (in_array($key, $user_domains)) {
               $user_options[$key] = $value;