diff --git a/include/class.user.php b/include/class.user.php
index 125220bcefd4b2d501cdf75fc54587f178dad182..c6c6b7535f6c2dd3e30bfd2f9f28993ecff70542 100644
--- a/include/class.user.php
+++ b/include/class.user.php
@@ -84,8 +84,9 @@ class User extends UserModel {
                 'name'=>$data['name'],
                 'created'=>new SqlFunction('NOW'),
                 'updated'=>new SqlFunction('NOW'),
-                'default_email'=>
-                    UserEmail::create(array('address'=>$data['email']))
+                //XXX: Do plain create once the cause
+                // of the detached emails is fixed.
+                'default_email' => UserEmail::ensure($data['email'])
             ));
             $user->save(true);
             $user->emails->add($user->default_email);