diff --git a/composer.json b/composer.json
index b75be326..3251c129 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
 
         "friendsofsymfony/oauth-server-bundle":     "~1.4",
         "friendsofsymfony/rest-bundle":             "1.4.x",
-        "friendsofsymfony/user-bundle":             "2.0.*@alpha",
+        "friendsofsymfony/user-bundle":             "2.0.*@dev",
         "knplabs/knp-gaufrette-bundle":             "*@dev",
         "nelmio/cors-bundle":                       "1.3.x",
         "jms/serializer-bundle":                    "0.13.x",
diff --git a/composer.lock b/composer.lock
index ca8910e4..6d982e3c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "80e838e06a2765136fe3b02d7784bc1a",
+    "hash": "9256e6c44bbbd548a9b13f53f8fbcb66",
     "packages": [
         {
             "name": "doctrine/annotations",
@@ -934,32 +934,31 @@
         },
         {
             "name": "friendsofsymfony/user-bundle",
-            "version": "v2.0.0-alpha1",
-            "target-dir": "FOS/UserBundle",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git",
-                "reference": "5a53273c3ae4e3f128c71522cd8398515718bbb8"
+                "reference": "92d5624f2a29e74d8fd9d2a94d7ed7998a8c2809"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/5a53273c3ae4e3f128c71522cd8398515718bbb8",
-                "reference": "5a53273c3ae4e3f128c71522cd8398515718bbb8",
+                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/92d5624f2a29e74d8fd9d2a94d7ed7998a8c2809",
+                "reference": "92d5624f2a29e74d8fd9d2a94d7ed7998a8c2809",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2",
-                "symfony/form": "~2.1",
-                "symfony/framework-bundle": "~2.1",
-                "symfony/security-bundle": "~2.1"
+                "symfony/form": "~2.3",
+                "symfony/framework-bundle": "~2.3",
+                "symfony/security-bundle": "~2.3",
+                "symfony/twig-bundle": "~2.3"
             },
             "require-dev": {
-                "doctrine/doctrine-bundle": "*",
-                "swiftmailer/swiftmailer": ">=4.3, <6.0",
-                "symfony/validator": "~2.1",
-                "symfony/yaml": "~2.1",
-                "twig/twig": "~1.5",
-                "willdurand/propel-typehintable-behavior": "dev-master"
+                "doctrine/doctrine-bundle": "~1.3",
+                "swiftmailer/swiftmailer": "~4.3|~5",
+                "symfony/validator": "~2.3",
+                "symfony/yaml": "~2.3",
+                "willdurand/propel-typehintable-behavior": "~1.0"
             },
             "suggest": {
                 "willdurand/propel-typehintable-behavior": "Needed when using the propel implementation"
@@ -971,8 +970,8 @@
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "FOS\\UserBundle": ""
+                "psr-4": {
+                    "FOS\\UserBundle\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -998,7 +997,7 @@
             "keywords": [
                 "User management"
             ],
-            "time": "2014-09-26 15:02:08"
+            "time": "2015-05-05 15:08:24"
         },
         {
             "name": "imagine/imagine",
@@ -5075,7 +5074,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "friendsofsymfony/user-bundle": 15,
+        "friendsofsymfony/user-bundle": 20,
         "knplabs/knp-gaufrette-bundle": 20,
         "doctrine/migrations": 20,
         "doctrine/doctrine-migrations-bundle": 20,
diff --git a/src/Kreta/Bundle/UserBundle/Resources/views/Security/login.html.twig b/src/Kreta/Bundle/UserBundle/Resources/views/Security/login.html.twig
index 5999067a..820ef840 100644
--- a/src/Kreta/Bundle/UserBundle/Resources/views/Security/login.html.twig
+++ b/src/Kreta/Bundle/UserBundle/Resources/views/Security/login.html.twig
@@ -4,7 +4,7 @@
 
 {% block content %}
     {% if error %}
-        <div>{{ error|trans }}</div>
+        <div>{{ error.messageKey|trans(error.messageData, 'security') }}</div>
     {% endif %}
 
     <h1>Sign in to <strong>kreta.io</strong></h1>
diff --git a/src/Kreta/Bundle/WebBundle/Behat/Context/authentication.feature b/src/Kreta/Bundle/WebBundle/Behat/Context/authentication.feature
index 99cd4368..a24d755a 100644
--- a/src/Kreta/Bundle/WebBundle/Behat/Context/authentication.feature
+++ b/src/Kreta/Bundle/WebBundle/Behat/Context/authentication.feature
@@ -38,4 +38,4 @@ Feature: Manage authentication
       | username | invalid@kreta.com |
       | password | invalid           |
     And I press "Login"
-    Then I should see "Invalid username or password"
+    Then I should see "Invalid credentials."