diff --git a/src/OpenSkedge/AppBundle/Controller/UserController.php b/src/OpenSkedge/AppBundle/Controller/UserController.php
index 373c07e..bcd4994 100644
--- a/src/OpenSkedge/AppBundle/Controller/UserController.php
+++ b/src/OpenSkedge/AppBundle/Controller/UserController.php
@@ -124,12 +124,12 @@ public function newAction(Request $request)
                 $plainPassword = $entity->getPassword();
                 $password = $encoder->encodePassword($plainPassword, $entity->getSalt());
                 $entity->setPassword($password);
+                $em->persist($entity);
+                $em->flush();
                 $clock = new Clock();
+                $clock->setUser($entity);
                 $em->persist($clock);
                 $em->flush();
-                $entity->setClock($clock);
-                $em->persist($entity);
-                $em->flush();
 
                 $mailer = $this->container->get('notify_mailer');
                 $mailer->notifyUserCreation($entity, $plainPassword);