diff --git a/lib/classes/databox/field.class.php b/lib/classes/databox/field.class.php
index 2c9f003fd3..f08f639d2b 100644
--- a/lib/classes/databox/field.class.php
+++ b/lib/classes/databox/field.class.php
@@ -177,7 +177,7 @@ class databox_field implements cache_cacheableInterface
     $this->required = !!$row['required'];
     $this->multi = !!$row['multi'];
     $this->report = !!$row['report'];
-    $this->type = $row['type'];
+    $this->type = $row['type'] ?: self::TYPE_STRING;
     $this->tbranch = $row['tbranch'];
     if ($row['dces_element'])
     {
diff --git a/lib/unitTest/api/v1/aplicationTest.php b/lib/unitTest/api/v1/aplicationTest.php
index 130a358e33..5ba8cc9511 100644
--- a/lib/unitTest/api/v1/aplicationTest.php
+++ b/lib/unitTest/api/v1/aplicationTest.php
@@ -246,7 +246,7 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract
           $this->assertTrue((strlen($metadatas->separator) > 0));
 
         $this->assertTrue(is_string($metadatas->thesaurus_branch));
-        $this->assertTrue(in_array($metadatas->type, array(databox_field::TYPE_DATE, databox_field::TYPE_NUMBER, databox_field::TYPE_TEXT)));
+        $this->assertTrue(in_array($metadatas->type, array(databox_field::TYPE_DATE,databox_field::TYPE_STRING, databox_field::TYPE_NUMBER, databox_field::TYPE_TEXT)));
         $this->assertTrue(is_bool($metadatas->indexable));
         $this->assertTrue(is_bool($metadatas->multivalue));
         $this->assertTrue(is_bool($metadatas->readonly));
diff --git a/lib/unitTest/api/v1/aplicationYamlTest.php b/lib/unitTest/api/v1/aplicationYamlTest.php
index ea3d70333e..7ca063191b 100644
--- a/lib/unitTest/api/v1/aplicationYamlTest.php
+++ b/lib/unitTest/api/v1/aplicationYamlTest.php
@@ -254,7 +254,7 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
           $this->assertTrue((strlen($metadatas["separator"]) > 0));
 
         $this->assertTrue(is_string($metadatas["thesaurus_branch"]));
-        $this->assertTrue(in_array($metadatas["type"], array(databox_field::TYPE_DATE, databox_field::TYPE_NUMBER, databox_field::TYPE_TEXT)));
+        $this->assertTrue(in_array($metadatas["type"], array(databox_field::TYPE_DATE,databox_field::TYPE_STRING, databox_field::TYPE_NUMBER, databox_field::TYPE_TEXT)));
         $this->assertTrue(is_bool($metadatas["indexable"]));
         $this->assertTrue(is_bool($metadatas["multivalue"]));
         $this->assertTrue(is_bool($metadatas["readonly"]));
diff --git a/lib/unitTest/userTest.php b/lib/unitTest/userTest.php
index 82e4fc5a3d..4bcc3d3912 100644
--- a/lib/unitTest/userTest.php
+++ b/lib/unitTest/userTest.php
@@ -37,12 +37,22 @@ class userTest extends PhraseanetPHPUnitAbstract
       $this->assertFalse(User_Adapter::get_usr_id_from_email(null));
       self::$user->set_email(''); 
       $this->assertFalse(User_Adapter::get_usr_id_from_email(null));
-      self::$user->set_email('noonealt1@example.com');
-      $this->assertEquals(self::$user->get_id(), User_Adapter::get_usr_id_from_email('noonealt1@example.com'));
+      self::$user->set_email('noone@example.com');
+      $this->assertEquals(self::$user->get_id(), User_Adapter::get_usr_id_from_email('noone@example.com'));
     }
     catch(Exception $e)
     {
       $this->fail($e->getMessage());
+    }
+    try
+    {
+      
+      self::$user->set_email('noonealt1@example.com');
+      $this->fail('A user already got this address');
+    }
+    catch(Exception $e)
+    {
+      
     }
     $this->assertFalse(User_Adapter::get_usr_id_from_email(null));
   }