Index: realname.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/realname/realname.module,v
retrieving revision 1.4.4.5
diff -u -p -r1.4.4.5 realname.module
--- realname.module	1 Sep 2008 16:48:29 -0000	1.4.4.5
+++ realname.module	1 Sep 2008 22:22:08 -0000
@@ -68,6 +68,14 @@ function realname_user($op, &$edit, &$ac
   if ($op == 'load') {
     $account->realname = realname_make_name($account);
   }
+  //if theme then replace name with realname
+    if (variable_get('realname_theme', false)) {
+      //Store it for places where it needed
+      if (!isset($account->realname_save) && is_object($account)) {
+        $account->realname_save = $account->name;
+        $account->name = $account->realname;
+      }
+    }
 }
 
 /**
@@ -111,6 +119,10 @@ function realname_form_alter(&$form, $fo
 
   global $user;
   switch ($form_id) { 
+    case 'user_profile_form':
+      $form['account']['name']['#default_value'] = $form['_account']['#value']->realname_save;
+      break;
+       
     case 'contact_mail_user':
       if (!isset($user->realname)) {
         $user = user_load(array('uid' => $user->uid));
@@ -145,7 +157,7 @@ function realname_make_name(&$account) {
   $pattern = variable_get('realname_pattern', ' ');
 
   // Has the profile been loaded?
-  if (!isset($account->{$fields[0]['name']})) {
+  if (!isset($account->{key($fields)})) {
     profile_load_profile($account);
   }
 
