diff --git a/Form/Type/CompletionContactType.php b/Form/Type/CompletionContactType.php
index ac1a2b0c..8a382f49 100644
--- a/Form/Type/CompletionContactType.php
+++ b/Form/Type/CompletionContactType.php
@@ -13,6 +13,7 @@
 
 use Sulu\Bundle\ContactBundle\Entity\Contact;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -29,11 +30,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $contact = $builder->getData();
 
         if (!$contact->getFirstName()) {
-            $builder->add('first_name', 'text');
+            $builder->add('firstName', TextType::class);
         }
 
         if (!$contact->getLastName()) {
-            $builder->add('last_name', 'text');
+            $builder->add('lastName', TextType::class);
         }
     }
 
diff --git a/Form/Type/ProfileContactType.php b/Form/Type/ProfileContactType.php
index 41cbe189..1a7c7cda 100644
--- a/Form/Type/ProfileContactType.php
+++ b/Form/Type/ProfileContactType.php
@@ -44,9 +44,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ]
         );
 
-        $builder->add('first_name', TextType::class);
-        $builder->add('last_name', TextType::class);
-        $builder->add('main_email', EmailType::class);
+        $builder->add('firstName', TextType::class);
+        $builder->add('lastName', TextType::class);
+        $builder->add('mainEmail', EmailType::class);
         $builder->add('avatar', FileType::class, ['mapped' => false, 'required' => false]);
 
         $builder->add(
diff --git a/Form/Type/RegistrationContactType.php b/Form/Type/RegistrationContactType.php
index e0015771..a0157367 100644
--- a/Form/Type/RegistrationContactType.php
+++ b/Form/Type/RegistrationContactType.php
@@ -27,8 +27,8 @@ class RegistrationContactType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('first_name', TextType::class);
-        $builder->add('last_name', TextType::class);
+        $builder->add('firstName', TextType::class);
+        $builder->add('lastName', TextType::class);
     }
 
     /**
diff --git a/Resources/config/validation.xml b/Resources/config/validation.xml
index 3d80b451..f1cee5de 100644
--- a/Resources/config/validation.xml
+++ b/Resources/config/validation.xml
@@ -47,9 +47,16 @@
         </property>
     </class>
 
+    <!-- User -->
+    <class name="Sulu\Bundle\SecurityBundle\Entity\User">
+        <property name="contact">
+            <constraint name="Valid" />
+        </property>
+    </class>
+
     <!-- Contact -->
-    <class name="Sulu\Bundle\SecurityBundle\Entity\ContactInterface">
-        <property name="first_name">
+    <class name="Sulu\Bundle\ContactBundle\Entity\Contact">
+        <property name="firstName">
             <constraint name="NotBlank">
                 <option name="groups">
                     <value>registration</value>
@@ -58,7 +65,7 @@
                 </option>
             </constraint>
         </property>
-        <property name="last_name">
+        <property name="lastName">
             <constraint name="NotBlank">
                 <option name="groups">
                     <value>registration</value>
@@ -67,10 +74,20 @@
                 </option>
             </constraint>
         </property>
+        <property name="addresses">
+            <constraint name="Valid" />
+        </property>
+    </class>
+
+    <!-- ContactAddress -->
+    <class name="Sulu\Bundle\ContactBundle\Entity\ContactAddress">
+        <property name="address">
+            <constraint name="Valid" />
+        </property>
     </class>
 
     <!-- Address -->
-    <class name="Sulu\Bundle\SecurityBundle\Entity\Address">
+    <class name="Sulu\Bundle\ContactBundle\Entity\Address">
         <property name="country">
             <constraint name="NotBlank">
                 <option name="groups">
diff --git a/Tests/Functional/Controller/ProfileControllerTest.php b/Tests/Functional/Controller/ProfileControllerTest.php
index 343d0faa..af6e270e 100644
--- a/Tests/Functional/Controller/ProfileControllerTest.php
+++ b/Tests/Functional/Controller/ProfileControllerTest.php
@@ -66,8 +66,8 @@ public function testForm()
         $crawler = $client->request('GET', '/profile');
         $this->assertHttpStatusCode(200, $client->getResponse());
 
-        $this->assertCount(1, $crawler->filter('#profile_contact_first_name'));
-        $this->assertCount(1, $crawler->filter('#profile_contact_last_name'));
+        $this->assertCount(1, $crawler->filter('#profile_contact_firstName'));
+        $this->assertCount(1, $crawler->filter('#profile_contact_lastName'));
         $this->assertCount(1, $crawler->filter('#profile_contact_contactAddresses_0_address_street'));
         $this->assertCount(1, $crawler->filter('#profile_contact_contactAddresses_0_address_number'));
         $this->assertCount(1, $crawler->filter('#profile_contact_contactAddresses_0_address_zip'));
@@ -78,8 +78,8 @@ public function testForm()
         $form = $crawler->selectButton('profile[submit]')->form(
             [
                 'profile[contact][formOfAddress]' => 0,
-                'profile[contact][first_name]' => 'Hikaru',
-                'profile[contact][last_name]' => 'Sulu',
+                'profile[contact][firstName]' => 'Hikaru',
+                'profile[contact][lastName]' => 'Sulu',
                 'profile[contact][contactAddresses][0][address][street]' => 'Rathausstraße',
                 'profile[contact][contactAddresses][0][address][number]' => 16,
                 'profile[contact][contactAddresses][0][address][zip]' => 12351,