diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php
index 22ec1043..4fec7637 100644
--- a/Controller/AbstractController.php
+++ b/Controller/AbstractController.php
@@ -113,7 +113,7 @@ protected function checkAutoLogin($type)
      *
      * @return Response
      */
-    protected function renderTemplate($type, $data)
+    protected function renderTemplate($type, $data = [])
     {
         return $this->render(
             $this->getCommunityManager($this->getWebspaceKey())->getConfigTypeProperty(
diff --git a/Controller/EmailConfirmationController.php b/Controller/EmailConfirmationController.php
new file mode 100644
index 00000000..224eb405
--- /dev/null
+++ b/Controller/EmailConfirmationController.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of Sulu.
+ *
+ * (c) MASSIVE ART WebServices GmbH
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Sulu\Bundle\CommunityBundle\Controller;
+
+use Sulu\Bundle\CommunityBundle\DependencyInjection\Configuration;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * Handle email confirmation.
+ */
+class EmailConfirmationController extends AbstractController
+{
+    const TYPE = Configuration::TYPE_EMAIL_CONFIRMATION;
+
+    /**
+     * Overwrite user email with contact email.
+     *
+     * @param Request $request
+     *
+     * @return Response
+     */
+    public function indexAction(Request $request)
+    {
+        $repository = $this->get('sulu_community.email_confirmation.repository');
+
+        $success = false;
+        $token = $repository->findByToken($request->get('token'));
+
+        if ($token !== null) {
+            $user = $token->getUser();
+            $user->setEmail($user->getContact()->getMainEmail());
+            $this->get('doctrine.orm.entity_manager')->remove($token);
+            $this->saveEntities();
+
+            $success = true;
+        }
+
+        return $this->renderTemplate(self::TYPE, ['success' => $success]);
+    }
+}
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 461def76..cb9e2260 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -46,6 +46,7 @@ class Configuration implements ConfigurationInterface
     const TYPE_BLACKLIST_CONFIRMED = 'blacklist_confirmed';
     const TYPE_BLACKLIST_DENIED = 'blacklist_denied';
     const TYPE_PROFILE = 'profile';
+    const TYPE_EMAIL_CONFIRMATION = 'email_confirmation';
 
     public static $TYPES = [
         self::TYPE_LOGIN,
@@ -139,6 +140,22 @@ public function getConfigTreeBuilder()
                                     ->end()
                                 ->end()
                             ->end()
+                            // Email change
+                            ->arrayNode(self::TYPE_EMAIL_CONFIRMATION)
+                                ->addDefaultsIfNotSet()
+                                ->children()
+                                    // Email change configuration
+                                    ->scalarNode(self::TEMPLATE)->defaultValue('SuluCommunityBundle:EmailConfirmation:success.html.twig')->end()
+                                    ->arrayNode(self::EMAIL)
+                                        ->addDefaultsIfNotSet()
+                                        ->children()
+                                            ->scalarNode(self::EMAIL_SUBJECT)->defaultValue('E-Mail change')->end()
+                                            ->scalarNode(self::EMAIL_ADMIN_TEMPLATE)->defaultValue(null)->end()
+                                            ->scalarNode(self::EMAIL_USER_TEMPLATE)->defaultValue('SuluCommunityBundle:EmailConfirmation:email.html.twig')->end()
+                                        ->end()
+                                    ->end()
+                                ->end()
+                            ->end()
                             // Confirmation
                             ->arrayNode(self::TYPE_CONFIRMATION)
                                 ->addDefaultsIfNotSet()
diff --git a/Entity/EmailConfirmationToken.php b/Entity/EmailConfirmationToken.php
new file mode 100644
index 00000000..82fc7db5
--- /dev/null
+++ b/Entity/EmailConfirmationToken.php
@@ -0,0 +1,87 @@
+<?php
+
+/*
+ * This file is part of Sulu.
+ *
+ * (c) MASSIVE ART WebServices GmbH
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Sulu\Bundle\CommunityBundle\Entity;
+
+use Sulu\Component\Security\Authentication\UserInterface;
+
+/**
+ * Represents a email-confirmation request.
+ */
+class EmailConfirmationToken
+{
+    /**
+     * @var int
+     */
+    private $id;
+
+    /**
+     * @var string
+     */
+    private $token;
+
+    /**
+     * @var UserInterface
+     */
+    private $user;
+
+    /**
+     * @param UserInterface $user
+     */
+    public function __construct(UserInterface $user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * Returns id.
+     *
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Returns token.
+     *
+     * @return string
+     */
+    public function getToken()
+    {
+        return $this->token;
+    }
+
+    /**
+     * Set token.
+     *
+     * @param string $token
+     *
+     * @return $this
+     */
+    public function setToken($token)
+    {
+        $this->token = $token;
+
+        return $this;
+    }
+
+    /**
+     * Returns user.
+     *
+     * @return UserInterface
+     */
+    public function getUser()
+    {
+        return $this->user;
+    }
+}
diff --git a/Entity/EmailConfirmationTokenRepository.php b/Entity/EmailConfirmationTokenRepository.php
new file mode 100644
index 00000000..7ad7ec4f
--- /dev/null
+++ b/Entity/EmailConfirmationTokenRepository.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of Sulu.
+ *
+ * (c) MASSIVE ART WebServices GmbH
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Sulu\Bundle\CommunityBundle\Entity;
+
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
+use Sulu\Component\Persistence\Repository\ORM\EntityRepository;
+use Symfony\Component\Security\Core\User\UserInterface;
+
+/**
+ * Provides special queries for email-confirmation-tokens.
+ */
+class EmailConfirmationTokenRepository extends EntityRepository
+{
+    /**
+     * Return email-confirmation for given token.
+     *
+     * @param string $token
+     *
+     * @return EmailConfirmationToken
+     */
+    public function findByToken($token)
+    {
+        try {
+            return $this->findOneBy(['token' => $token]);
+        } catch (NonUniqueResultException $e) {
+            return;
+        } catch (NoResultException $e) {
+            return;
+        }
+    }
+
+    /**
+     * Return email-confirmation for given token.
+     *
+     * @param UserInterface $user
+     *
+     * @return EmailConfirmationToken
+     */
+    public function findByUser($user)
+    {
+        try {
+            return $this->findOneBy(['user' => $user]);
+        } catch (NonUniqueResultException $e) {
+            return;
+        } catch (NoResultException $e) {
+            return;
+        }
+    }
+}
diff --git a/EventListener/EmailConfirmationListener.php b/EventListener/EmailConfirmationListener.php
new file mode 100644
index 00000000..53b52b90
--- /dev/null
+++ b/EventListener/EmailConfirmationListener.php
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ * This file is part of Sulu.
+ *
+ * (c) MASSIVE ART WebServices GmbH
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Sulu\Bundle\CommunityBundle\EventListener;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Sulu\Bundle\CommunityBundle\DependencyInjection\Configuration;
+use Sulu\Bundle\CommunityBundle\Entity\EmailConfirmationToken;
+use Sulu\Bundle\CommunityBundle\Entity\EmailConfirmationTokenRepository;
+use Sulu\Bundle\CommunityBundle\Event\CommunityEvent;
+use Sulu\Bundle\CommunityBundle\Mail\Mail;
+use Sulu\Bundle\CommunityBundle\Mail\MailFactoryInterface;
+use Sulu\Bundle\SecurityBundle\Util\TokenGeneratorInterface;
+
+/**
+ * Compares user-email and contact main-email.
+ * If they are different a confirmation link will be send.
+ */
+class EmailConfirmationListener
+{
+    /**
+     * @var MailFactoryInterface
+     */
+    private $mailFactory;
+
+    /**
+     * @var EntityManagerInterface
+     */
+    private $entityManager;
+
+    /**
+     * @var TokenGeneratorInterface
+     */
+    private $tokenGenerator;
+
+    /**
+     * @var EmailConfirmationTokenRepository
+     */
+    private $emailConformationRepository;
+
+    /**
+     * @param MailFactoryInterface $mailFactory
+     * @param EntityManagerInterface $entityManager
+     * @param EmailConfirmationTokenRepository $emailConformationRepository
+     * @param TokenGeneratorInterface $tokenGenerator
+     */
+    public function __construct(
+        MailFactoryInterface $mailFactory,
+        EntityManagerInterface $entityManager,
+        EmailConfirmationTokenRepository $emailConformationRepository,
+        TokenGeneratorInterface $tokenGenerator
+    ) {
+        $this->mailFactory = $mailFactory;
+        $this->entityManager = $entityManager;
+        $this->emailConformationRepository = $emailConformationRepository;
+        $this->tokenGenerator = $tokenGenerator;
+    }
+
+    /**
+     * Send confirmation-email if email-address has changed.
+     *
+     * @param CommunityEvent $event
+     */
+    public function sendConfirmationOnEmailChange(CommunityEvent $event)
+    {
+        $user = $event->getUser();
+        if ($user->getEmail() === $user->getContact()->getMainEmail()) {
+            return;
+        }
+
+        $entity = $this->emailConformationRepository->findByUser($user);
+        $token = $this->tokenGenerator->generateToken();
+        if (null === $entity) {
+            $entity = new EmailConfirmationToken($user);
+            $this->entityManager->persist($entity);
+        }
+
+        $entity->setToken($token);
+        $this->entityManager->flush();
+
+        $this->mailFactory->sendEmails(
+            Mail::create(
+                $event->getConfigProperty(Configuration::EMAIL_FROM),
+                $event->getConfigProperty(Configuration::EMAIL_TO),
+                $event->getConfigTypeProperty(Configuration::TYPE_EMAIL_CONFIRMATION, Configuration::EMAIL)
+            )->setUserEmail($user->getContact()->getMainEmail()),
+            $user,
+            ['token' => $entity->getToken()]
+        );
+    }
+}
diff --git a/Form/Type/ProfileContactType.php b/Form/Type/ProfileContactType.php
index 6edab7ae..b19fc420 100644
--- a/Form/Type/ProfileContactType.php
+++ b/Form/Type/ProfileContactType.php
@@ -15,6 +15,7 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Extension\Core\Type\FileType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -45,6 +46,7 @@ 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('avatar', FileType::class, ['mapped' => false, 'required' => false]);
 
         $builder->add(
diff --git a/Form/Type/ProfileNoteType.php b/Form/Type/ProfileNoteType.php
index fede67e7..99e32e2c 100644
--- a/Form/Type/ProfileNoteType.php
+++ b/Form/Type/ProfileNoteType.php
@@ -13,10 +13,14 @@
 
 use Sulu\Bundle\ContactBundle\Entity\Note;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * Profile note form.
+ */
 class ProfileNoteType extends AbstractType
 {
     /**
@@ -25,6 +29,20 @@ class ProfileNoteType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add('value', TextType::class, ['required' => false, 'label' => 'Note']);
+        $builder->get('value')->addViewTransformer(
+            new CallbackTransformer(
+                function ($value) {
+                    return $value;
+                },
+                function ($value) {
+                    if ($value === null) {
+                        return '';
+                    }
+
+                    return $value;
+                }
+            )
+        );
     }
 
     /**
diff --git a/Mail/Mail.php b/Mail/Mail.php
index c9965077..2d5ac436 100644
--- a/Mail/Mail.php
+++ b/Mail/Mail.php
@@ -48,6 +48,11 @@ public static function create($from, $to, $config)
      */
     private $to;
 
+    /**
+     * @var string
+     */
+    private $userEmail;
+
     /**
      * @var string
      */
@@ -128,4 +133,29 @@ public function getAdminTemplate()
     {
         return $this->adminTemplate;
     }
+
+    /**
+     * Returns user-email.
+     *
+     * @return string
+     */
+    public function getUserEmail()
+    {
+        return $this->userEmail;
+    }
+
+    /**
+     * Set user-email.
+     * This setting overwrite the user-email.
+     *
+     * @param string $userEmail
+     *
+     * @return $this
+     */
+    public function setUserEmail($userEmail)
+    {
+        $this->userEmail = $userEmail;
+
+        return $this;
+    }
 }
diff --git a/Mail/MailFactory.php b/Mail/MailFactory.php
index 515e15a0..b6f15552 100644
--- a/Mail/MailFactory.php
+++ b/Mail/MailFactory.php
@@ -53,6 +53,9 @@ public function __construct(\Swift_Mailer $mailer, EngineInterface $engine, Tran
     public function sendEmails(Mail $mail, BaseUser $user, $parameters = [])
     {
         $email = $user->getEmail();
+        if ($mail->getUserEmail()) {
+            $email = $mail->getUserEmail();
+        }
         $data = array_merge($parameters, ['user' => $user]);
 
         // Send User Email
diff --git a/Manager/UserManager.php b/Manager/UserManager.php
index 647d1706..75392b0b 100644
--- a/Manager/UserManager.php
+++ b/Manager/UserManager.php
@@ -103,6 +103,8 @@ public function createUser(User $user, $webspaceKey, $roleName)
             $contact->setLastName('');
         }
 
+        $contact->setMainEmail($user->getEmail());
+
         // Create and Add User Role
         $userRole = $this->createUserRole($user, $webspaceKey, $roleName);
         $user->addUserRole($userRole);
diff --git a/Resources/config/doctrine/BlacklistItem.orm.xml b/Resources/config/doctrine/BlacklistItem.orm.xml
index 58a4c8a3..cdb6d1d1 100644
--- a/Resources/config/doctrine/BlacklistItem.orm.xml
+++ b/Resources/config/doctrine/BlacklistItem.orm.xml
@@ -4,6 +4,10 @@
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Sulu\Bundle\CommunityBundle\Entity\BlacklistItem" table="com_blacklist_item"
             repository-class="Sulu\Bundle\CommunityBundle\Entity\BlacklistItemRepository">
+        <indexes>
+            <index columns="regexpPattern"/>
+        </indexes>
+
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
diff --git a/Resources/config/doctrine/BlacklistUser.orm.xml b/Resources/config/doctrine/BlacklistUser.orm.xml
index 905cb060..7b3af992 100644
--- a/Resources/config/doctrine/BlacklistUser.orm.xml
+++ b/Resources/config/doctrine/BlacklistUser.orm.xml
@@ -4,6 +4,10 @@
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <entity name="Sulu\Bundle\CommunityBundle\Entity\BlacklistUser" table="com_blacklist_user"
             repository-class="Sulu\Bundle\CommunityBundle\Entity\BlacklistUserRepository">
+        <indexes>
+            <index columns="token"/>
+        </indexes>
+
         <id name="id" type="integer" column="id">
             <generator strategy="AUTO"/>
         </id>
diff --git a/Resources/config/doctrine/EmailConfirmationToken.orm.xml b/Resources/config/doctrine/EmailConfirmationToken.orm.xml
new file mode 100644
index 00000000..b4d25bf3
--- /dev/null
+++ b/Resources/config/doctrine/EmailConfirmationToken.orm.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+    <entity name="Sulu\Bundle\CommunityBundle\Entity\EmailConfirmationToken" table="com_email_token"
+            repository-class="Sulu\Bundle\CommunityBundle\Entity\EmailConfirmationTokenRepository">
+        <indexes>
+            <index columns="token"/>
+        </indexes>
+
+        <id name="id" type="integer" column="id">
+            <generator strategy="AUTO"/>
+        </id>
+
+        <field name="token" type="string" column="token" unique="true"/>
+
+        <one-to-one field="user" target-entity="Sulu\Component\Security\Authentication\UserInterface">
+            <join-column name="userId" referenced-column-name="id" on-delete="CASCADE"/>
+        </one-to-one>
+    </entity>
+</doctrine-mapping>
diff --git a/Resources/config/routing_website.xml b/Resources/config/routing_website.xml
index ef6614f0..fa7f0f77 100644
--- a/Resources/config/routing_website.xml
+++ b/Resources/config/routing_website.xml
@@ -44,5 +44,9 @@
         <default key="_controller">SuluCommunityBundle:Profile:index</default>
     </route>
 
+    <route id="sulu_community.email_confirmation" path="/profile/email-confirmation">
+        <default key="_controller">SuluCommunityBundle:EmailConfirmation:index</default>
+    </route>
+
     <route id="sulu_community.logout" path="/logout"/>
 </routes>
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index 7bd84eaf..31f200fa 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -39,7 +39,7 @@
             <argument type="service" id="sulu_community.mail_factory"/>
         </service>
 
-        <!-- event-listener -->
+        <!-- mail-listener -->
         <service id="sulu_community.mail_listener" class="Sulu\Bundle\CommunityBundle\EventListener\MailListener">
             <argument type="service" id="sulu_community.mail_factory"/>
 
@@ -68,7 +68,7 @@
                  priority="51"/>
         </service>
 
-        <!-- Completion Listener -->
+        <!-- completion-istener -->
         <service id="sulu_community.completion_listener"
                  class="Sulu\Bundle\CommunityBundle\EventListener\CompletionListener">
             <argument type="service" id="sulu_core.webspace.request_analyzer"/>
@@ -113,6 +113,24 @@
             <argument type="string">SuluCommunityBundle:BlacklistUser</argument>
         </service>
 
+        <!-- email-confirmation -->
+        <service id="sulu_community.email_confirmation.listener"
+                 class="Sulu\Bundle\CommunityBundle\EventListener\EmailConfirmationListener">
+            <argument type="service" id="sulu_community.mail_factory"/>
+            <argument type="service" id="doctrine.orm.entity_manager"/>
+            <argument type="service" id="sulu_community.email_confirmation.repository"/>
+            <argument type="service" id="sulu_security.token_generator"/>
+
+            <tag name="kernel.event_listener" event="%sulu_community.event.save_profile%"
+                 method="sendConfirmationOnEmailChange"/>
+        </service>
+        <service id="sulu_community.email_confirmation.repository"
+                 class="Sulu\Bundle\CommunityBundle\Entity\EmailConfirmationTokenRepository">
+            <factory service="doctrine.orm.entity_manager" method="getRepository"/>
+
+            <argument type="string">SuluCommunityBundle:EmailConfirmationToken</argument>
+        </service>
+
         <!-- mailing -->
         <service id="sulu_community.mail_factory" class="Sulu\Bundle\CommunityBundle\Mail\MailFactory">
             <argument type="service" id="mailer"/>
diff --git a/Resources/views/EmailConfirmation/email.html.twig b/Resources/views/EmailConfirmation/email.html.twig
new file mode 100644
index 00000000..508260c9
--- /dev/null
+++ b/Resources/views/EmailConfirmation/email.html.twig
@@ -0,0 +1,2 @@
+{% set confirmUrl = url('sulu_community.email_confirmation', { token: token }) %}
+<a href="{{ confirmUrl }}">{{ confirmUrl }}</a>
diff --git a/Resources/views/EmailConfirmation/success.html.twig b/Resources/views/EmailConfirmation/success.html.twig
new file mode 100644
index 00000000..56ac778a
--- /dev/null
+++ b/Resources/views/EmailConfirmation/success.html.twig
@@ -0,0 +1,15 @@
+{% extends "master.html.twig" %}
+
+{% block content %}
+    <h1>{{ 'Profile'|trans }}</h1>
+
+    {% if success %}
+        <p class="success">
+            {{ 'email_confirmation_finished'|trans }}
+        </p>
+    {% else %}
+        <p class="fail">
+            {{ 'email_confirmation_failed'|trans }}
+        </p>
+    {% endif %}
+{% endblock %}
diff --git a/Resources/views/Profile/form.html.twig b/Resources/views/Profile/form.html.twig
index a18eb7f5..9d460ced 100644
--- a/Resources/views/Profile/form.html.twig
+++ b/Resources/views/Profile/form.html.twig
@@ -1,5 +1,17 @@
 {% extends "master.html.twig" %}
 
+{% form_theme form _self %}
+
+{% block email_widget %}
+    {% spaceless %}
+
+        {{ dump() }}
+
+        {{ block('form_widget') }}
+
+    {% endspaceless %}
+{% endblock %}
+
 {% block content %}
     <h1>{{ 'Profile'|trans }}</h1>
 
diff --git a/Tests/Functional/Controller/EmailConfirmationControllerTest.php b/Tests/Functional/Controller/EmailConfirmationControllerTest.php
new file mode 100644
index 00000000..ea134b26
--- /dev/null
+++ b/Tests/Functional/Controller/EmailConfirmationControllerTest.php
@@ -0,0 +1,107 @@
+<?php
+
+/*
+ * This file is part of Sulu.
+ *
+ * (c) MASSIVE ART WebServices GmbH
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Sulu\Bundle\CommunityBundle\Tests\Functional\Controller;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Sulu\Bundle\CommunityBundle\Entity\EmailConfirmationToken;
+use Sulu\Bundle\ContactBundle\Entity\Contact;
+use Sulu\Bundle\SecurityBundle\Entity\User;
+use Sulu\Bundle\TestBundle\Testing\SuluTestCase;
+
+class EmailConfirmationControllerTest extends SuluTestCase
+{
+    /**
+     * @var User
+     */
+    private $user;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->purgeDatabase();
+
+        /** @var EntityManagerInterface $entityManager */
+        $entityManager = $this->getEntityManager();
+
+        $contact = new Contact();
+        $contact->setMainEmail('new@sulu.io');
+        $contact->setFirstName('Hikaru');
+        $contact->setLastName('Sulu');
+
+        $entityManager->persist($contact);
+        $entityManager->flush();
+
+        $this->user = new User();
+        $this->user->setEmail('test@sulu.io');
+        $this->user->setUsername('test');
+        $this->user->setPassword('test');
+        $this->user->setSalt('test');
+        $this->user->setLocale('de');
+        $this->user->setContact($contact);
+
+        $token = new EmailConfirmationToken($this->user);
+        $token->setToken('123-123-123');
+
+        $entityManager->persist($this->user);
+        $entityManager->persist($token);
+        $entityManager->flush();
+    }
+
+    public function testConfirm()
+    {
+        $client = $this->createClient(
+            [
+                'sulu_context' => 'website',
+                'environment' => 'dev',
+            ]
+        );
+
+        $crawler = $client->request('GET', '/profile/email-confirmation?token=123-123-123');
+        $this->assertHttpStatusCode(200, $client->getResponse());
+
+        $this->assertCount(1, $crawler->filter('.success'));
+        $this->assertCount(0, $crawler->filter('.fail'));
+
+        /** @var EntityManagerInterface $entityManager */
+        $entityManager = $this->getEntityManager();
+        $entityManager->clear();
+
+        $this->assertNull($entityManager->getRepository(EmailConfirmationToken::class)->findByToken('123-123-123'));
+
+        $user = $entityManager->find(User::class, $this->user->getId());
+        $contact = $user->getContact();
+
+        $this->assertEquals($user->getEmail(), $contact->getMainEmail());
+    }
+
+    public function testConfirmWrongToken()
+    {
+        $client = $this->createClient(
+            [
+                'sulu_context' => 'website',
+                'environment' => 'dev',
+            ]
+        );
+
+        $crawler = $client->request('GET', '/profile/email-confirmation?token=312-312-312');
+        $this->assertHttpStatusCode(200, $client->getResponse());
+
+        $this->assertCount(0, $crawler->filter('.success'));
+        $this->assertCount(1, $crawler->filter('.fail'));
+
+        /** @var EntityManagerInterface $entityManager */
+        $entityManager = $this->getEntityManager();
+
+        $this->assertNotNull($entityManager->getRepository(EmailConfirmationToken::class)->findByToken('123-123-123'));
+    }
+}
diff --git a/Tests/Unit/Listener/EmailConfirmationListenerTest.php b/Tests/Unit/Listener/EmailConfirmationListenerTest.php
new file mode 100644
index 00000000..11453d36
--- /dev/null
+++ b/Tests/Unit/Listener/EmailConfirmationListenerTest.php
@@ -0,0 +1,168 @@
+<?php
+
+/*
+ * This file is part of Sulu.
+ *
+ * (c) MASSIVE ART WebServices GmbH
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Sulu\Bundle\CommunityBundle\Tests\Unit\Listener;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\Argument;
+use Sulu\Bundle\CommunityBundle\DependencyInjection\Configuration;
+use Sulu\Bundle\CommunityBundle\Entity\EmailConfirmationToken;
+use Sulu\Bundle\CommunityBundle\Entity\EmailConfirmationTokenRepository;
+use Sulu\Bundle\CommunityBundle\Event\CommunityEvent;
+use Sulu\Bundle\CommunityBundle\EventListener\EmailConfirmationListener;
+use Sulu\Bundle\CommunityBundle\Mail\Mail;
+use Sulu\Bundle\CommunityBundle\Mail\MailFactoryInterface;
+use Sulu\Bundle\ContactBundle\Entity\Contact;
+use Sulu\Bundle\SecurityBundle\Entity\User;
+use Sulu\Bundle\SecurityBundle\Util\TokenGeneratorInterface;
+
+class EmailConfirmationListenerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var MailFactoryInterface
+     */
+    private $mailFactory;
+
+    /**
+     * @var EntityManagerInterface
+     */
+    private $entityManager;
+
+    /**
+     * @var EmailConfirmationTokenRepository
+     */
+    private $repository;
+
+    /**
+     * @var TokenGeneratorInterface
+     */
+    private $tokenGenerator;
+
+    /**
+     * @var EmailConfirmationListener
+     */
+    private $listener;
+
+    /**
+     * @var CommunityEvent
+     */
+    private $event;
+
+    /**
+     * @var User
+     */
+    private $user;
+
+    /**
+     * @var Contact
+     */
+    private $contact;
+
+    /**
+     * @var EmailConfirmationToken
+     */
+    private $token;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setUp()
+    {
+        $this->mailFactory = $this->prophesize(MailFactoryInterface::class);
+        $this->entityManager = $this->prophesize(EntityManagerInterface::class);
+        $this->repository = $this->prophesize(EmailConfirmationTokenRepository::class);
+        $this->tokenGenerator = $this->prophesize(TokenGeneratorInterface::class);
+
+        $this->listener = new EmailConfirmationListener(
+            $this->mailFactory->reveal(),
+            $this->entityManager->reveal(),
+            $this->repository->reveal(),
+            $this->tokenGenerator->reveal()
+        );
+
+        $this->event = $this->prophesize(CommunityEvent::class);
+        $this->user = $this->prophesize(User::class);
+        $this->contact = $this->prophesize(Contact::class);
+        $this->token = $this->prophesize(EmailConfirmationToken::class);
+
+        $this->event->getUser()->willReturn($this->user->reveal());
+        $this->event->getConfigProperty(Argument::any())->willReturnArgument(0);
+        $this->event->getConfigTypeProperty(Argument::cetera())->willReturn(
+            [
+                Configuration::EMAIL_SUBJECT => '',
+                Configuration::EMAIL_USER_TEMPLATE => '',
+                Configuration::EMAIL_ADMIN_TEMPLATE => ''
+            ]
+        );
+        $this->user->getContact()->willReturn($this->contact->reveal());
+        $this->token->getUser()->willReturn($this->user->reveal());
+    }
+
+    public function testSendConfirmation()
+    {
+        $this->user->getEmail()->willReturn('test@sulu.io');
+        $this->contact->getMainEmail()->willReturn('new@sulu.io');
+        $this->repository->findByUser($this->user->reveal())->willReturn(null);
+        $this->tokenGenerator->generateToken()->willReturn('123-123-123');
+
+        $this->entityManager->persist(
+            Argument::that(
+                function (EmailConfirmationToken $token) {
+                    return $token->getToken() === '123-123-123' && $token->getUser() === $this->user->reveal();
+                }
+            )
+        );
+        $this->entityManager->flush();
+
+        $this->mailFactory->sendEmails(
+            Argument::type(Mail::class),
+            $this->user->reveal(),
+            ['token' => '123-123-123']
+        )->shouldBeCalled();
+
+        $this->listener->sendConfirmationOnEmailChange($this->event->reveal());
+    }
+
+    public function testSendConfirmationExistingToken()
+    {
+        $this->user->getEmail()->willReturn('test@sulu.io');
+        $this->contact->getMainEmail()->willReturn('new@sulu.io');
+        $this->repository->findByUser($this->user->reveal())->willReturn($this->token->reveal());
+        $this->tokenGenerator->generateToken()->willReturn('123-123-123');
+
+        $this->token->setToken('123-123-123')->shouldBeCalled();
+        $this->token->getToken()->willReturn('123-123-123');
+
+        $this->entityManager->persist(Argument::any())->shouldNotBeCalled();
+        $this->entityManager->flush()->shouldBeCalled();
+
+        $this->mailFactory->sendEmails(
+            Argument::type(Mail::class),
+            $this->user->reveal(),
+            ['token' => '123-123-123']
+        )->shouldBeCalled();
+
+        $this->listener->sendConfirmationOnEmailChange($this->event->reveal());
+    }
+
+    public function testSendConfirmationNoChange()
+    {
+        $this->user->getEmail()->willReturn('test@sulu.io');
+        $this->contact->getMainEmail()->willReturn('test@sulu.io');
+
+        $this->entityManager->persist(Argument::any())->shouldNotBeCalled();
+        $this->entityManager->flush()->shouldNotBeCalled();
+
+        $this->mailFactory->sendEmails(Argument::cetera())->shouldNotBeCalled();
+
+        $this->listener->sendConfirmationOnEmailChange($this->event->reveal());
+    }
+}