diff --git a/src/KekRozsak/FrontBundle/Controller/DefaultController.php b/src/KekRozsak/FrontBundle/Controller/DefaultController.php
index 4aad5c6..4faefc0 100644
--- a/src/KekRozsak/FrontBundle/Controller/DefaultController.php
+++ b/src/KekRozsak/FrontBundle/Controller/DefaultController.php
@@ -61,7 +61,7 @@ class DefaultController extends Controller
 			$form->bindRequest($request);
 			if ($form->isValid())
 			{
-				if ($this->getPassword() == '')
+				if ($user->getPassword() == '')
 					$user->setPassword($oldPassword);
 				else
 					$user->setPassword($this->get('security.encoder_factory')->getEncoder($user)->encodePassword($user->getPassword(), $user->getSalt()));
diff --git a/src/KekRozsak/FrontBundle/Entity/UserData.php b/src/KekRozsak/FrontBundle/Entity/UserData.php
index 203058c..fa77424 100644
--- a/src/KekRozsak/FrontBundle/Entity/UserData.php
+++ b/src/KekRozsak/FrontBundle/Entity/UserData.php
@@ -26,7 +26,8 @@ class UserData
 	/**
 	 * @var KekRozsak\SecurityBundle\Entity\User $user
 	 * @ORM\Id
-	 * @ORM\OneToOne(targetEntity="KekRozsak\SecurityBundle\Entity\User")
+	 * @ORM\GeneratedValue(strategy="NONE")
+	 * @ORM\OneToOne(targetEntity="KekRozsak\SecurityBundle\Entity\User", inversedBy="userData")
 	 * @ORM\JoinColumn(name="user_id")
 	 */
 	protected $user;
diff --git a/src/KekRozsak/SecurityBundle/Entity/User.php b/src/KekRozsak/SecurityBundle/Entity/User.php
index f3b7811..415ecde 100644
--- a/src/KekRozsak/SecurityBundle/Entity/User.php
+++ b/src/KekRozsak/SecurityBundle/Entity/User.php
@@ -247,8 +247,7 @@ class User implements UserInterface, AdvancedUserInterface
 
 	/**
 	 * @var \KekRozsak\FrontBundle\Entity\UserData $userData
-	 * @ORM\OneToMany(targetEntity="KekRozsak\FrontBundle\Entity\UserData", fetch="LAZY", cascade={"persist"}, mappedBy="user")
-	 * @ORM\JoinColumn(name="id", referencedColumnName="user_id")
+	 * @ORM\OneToOne(targetEntity="KekRozsak\FrontBundle\Entity\UserData", fetch="LAZY", cascade={"persist"}, mappedBy="user")
 	 */
 	protected $userData;
 
@@ -261,7 +260,7 @@ class User implements UserInterface, AdvancedUserInterface
 	 */
 	public function setUserData(\KekRozsak\FrontBundle\Entity\UserData $userData = null)
 	{
-		$this->userData = new ArrayCollection(array($userData));
+		$this->userData = $userData;
 		$userData->setUser($this);
 		return $this;
 	}
@@ -273,7 +272,7 @@ class User implements UserInterface, AdvancedUserInterface
 	 */
 	public function getUserData()
 	{
-		return $this->userData->get(1);
+		return $this->userData;
 	}
 
 	/**