diff -ru sharedemail/.svn/entries sharedemail_new/.svn/entries
--- sharedemail/.svn/entries	2011-03-09 10:07:54.000000000 -0600
+++ sharedemail_new/.svn/entries	2011-03-09 10:06:43.000000000 -0600
@@ -69,7 +69,7 @@
 
 
 
-2011-03-09T16:07:54.000000Z
+2011-02-16T14:01:08.000000Z
 110100284a7236f59859f30abbf10b42
 2011-02-16T01:10:47.556947Z
 1
diff -ru sharedemail/sharedemail.module sharedemail_new/sharedemail.module
--- sharedemail/sharedemail.module	2011-03-09 10:07:54.000000000 -0600
+++ sharedemail_new/sharedemail.module	2011-03-09 10:06:43.000000000 -0600
@@ -93,15 +93,6 @@
         }
       }
       break;
-    case 'submit':
-    case 'update':
-      if (strpos($mail, 'sharedemail_') == 0 && isset($edit['mail'])) {
-        $edit['mail'] = str_replace('sharedemail_', '', $mail);
-        if (module_exists('logintoboggan')) {
-          $edit['conf_mail'] = str_replace('sharedemail_', '', $mail);
-        }
-      }
-      break;
 
     // Creating a new user, this hook is called after db insert
     case 'insert':
@@ -111,6 +102,16 @@
         db_query("UPDATE {users} SET mail = '%s' WHERE uid = '%d'", $realmail, $user->uid);
         $user->mail = $realmail;
       }
+      // Fallthrough in order to set $edit fields back.
+
+    case 'submit':
+    case 'update':
+      if (strpos($mail, 'sharedemail_') == 0 && isset($edit['mail'])) {
+        $edit['mail'] = str_replace('sharedemail_', '', $mail);
+        if (module_exists('logintoboggan')) {
+          $edit['conf_mail'] = str_replace('sharedemail_', '', $mail);
+        }
+      }
       break;
   }
 }