diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index b06d7db90..75b6831de 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -50,7 +50,7 @@
             <div class="row justify-content-center">
                 
                 {# Flash messages ! #}
-                {% if app.session.flashbag.all()|length > 0 %}
+                {% if app.session.flashbag.keys()|length > 0 %}
                 <div class="col-8 mt-5 flash_message">
                 
                     {% for flashMessage in app.session.flashbag.get('success') %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
index 21a56b027..cfbc16f4f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
@@ -29,7 +29,7 @@
             <div class="col-md-9">
                 
                 {# Flash messages ! #}
-                {% if app.session.flashbag.all()|length > 0 %}
+                {% if app.session.flashbag.keys()|length > 0 %}
                 <div class="row justify-content-center mt-5">
                     
                     {% for flashMessage in app.session.flashbag.get('success') %}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
index 5be74fa8f..69e4f568d 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
@@ -190,7 +190,7 @@ var_dump($crawler->text());
             'the value '.$field.' is updated in db');
 
         $crawler = $this->client->followRedirect();
-        $this->assertGreaterThan(0, $crawler->filter('.success')->count(),
+        $this->assertGreaterThan(0, $crawler->filter('.alert-success')->count(),
             'a element .success is shown');
 
         if($field == 'birthdate' or $field == 'memo' or $field == 'countryOfBirth' or $field == 'nationality'
@@ -245,7 +245,7 @@ var_dump($crawler->text());
 
         $this->assertFalse($this->client->getResponse()->isRedirect(),
             'the page is not redirected to /general');
-        $this->assertGreaterThan(0, $crawler->filter('.error')->count(),
+        $this->assertGreaterThan(0, $crawler->filter('.alert-danger')->count(),
             'a element .error is shown');
     }