diff --git a/src/Application/Actions/Group/AddUserGroupAction.php b/src/Application/Actions/Group/AddUserGroupAction.php
index 9a37f61492c137fc63b8db3f84883f36447a7fc3..bd68c6590f17f714e53f5a886477ac9169b29363 100755
--- a/src/Application/Actions/Group/AddUserGroupAction.php
+++ b/src/Application/Actions/Group/AddUserGroupAction.php
@@ -15,7 +15,7 @@ class AddUserGroupAction extends GroupAction
     protected function action(): Response
     {
         if(!isset($_SESSION['userId'])){
-            $this->flash->addMessage('message', 'Please log in or sign up.');
+            $this->flash->addMessage('flashMessages', 'Please log in or sign up.');
 
             return $this->response
             ->withHeader('Location', '/login')
diff --git a/src/Application/Actions/Group/CreateGroupAction.php b/src/Application/Actions/Group/CreateGroupAction.php
index 7d2b69a2b47411b8cf046428900da4ee815ba2bf..1cbb90d886a81845e69173d978884e7149ce2589 100755
--- a/src/Application/Actions/Group/CreateGroupAction.php
+++ b/src/Application/Actions/Group/CreateGroupAction.php
@@ -17,7 +17,7 @@ class CreateGroupAction extends GroupAction
         $parsedRequestBody = (array)$this->request->getParsedBody();
 
         if(!isset($_SESSION['userId'])){
-            $this->flash->addMessage('message', 'Please log in or sign up.');
+            $this->flash->addMessage('flashMessages', 'Please log in or sign up.');
 
             return $this->response
             ->withHeader('Location', '/login')
@@ -36,7 +36,7 @@ class CreateGroupAction extends GroupAction
                     "name" => $groupname,
                     "description" => $description,
                     "private" => $private,
-                    "message" => "Groupname already exist",
+                    "flashMessages" => [["Groupname already exist"]],
                     "formstatus" => "error"
                 )
             );
diff --git a/src/Application/Actions/Group/DeleteGroupAction.php b/src/Application/Actions/Group/DeleteGroupAction.php
index f0c91a45d8eee6920c1e8319788692bf53ec9680..272181de56b7d82f0c830618e67c2783c1ac6df7 100755
--- a/src/Application/Actions/Group/DeleteGroupAction.php
+++ b/src/Application/Actions/Group/DeleteGroupAction.php
@@ -15,7 +15,7 @@ class DeleteGroupAction extends GroupAction
     protected function action(): Response
     {
         if(!isset($_SESSION['userId'])){
-            $this->flash->addMessage('message', 'Please log in or sign up.');
+            $this->flash->addMessage('flashMessages', 'Please log in or sign up.');
 
             return $this->response
             ->withHeader('Location', '/login')
diff --git a/src/Application/Actions/Group/ViewModifyGroupForm.php b/src/Application/Actions/Group/ViewModifyGroupForm.php
index 509d42cc7188bc8fe6cbbc466ac89cebea9b5aca..85d5abd6e776fbdee6de991516983107a40f8d61 100644
--- a/src/Application/Actions/Group/ViewModifyGroupForm.php
+++ b/src/Application/Actions/Group/ViewModifyGroupForm.php
@@ -14,7 +14,7 @@ class ViewModifyGroupForm extends GroupAction
     protected function action(): Response
     {
         if(!isset($_SESSION['userId'])){
-            $this->flash->addMessage('message', 'Please log in or sign up.');
+            $this->flash->addMessage('flashMessages', 'Please log in or sign up.');
 
             return $this->response
             ->withHeader('Location', '/login')
diff --git a/src/Application/Actions/User/CreateUserAction.php b/src/Application/Actions/User/CreateUserAction.php
index 0f71786c234259482cefedcfe38bd46167b7ff3a..686cf732248460b0a728c5f39f6fee10bd4d555f 100755
--- a/src/Application/Actions/User/CreateUserAction.php
+++ b/src/Application/Actions/User/CreateUserAction.php
@@ -56,7 +56,7 @@ class CreateUserAction extends UserAction
                     "contaminated" => $contaminated,
                     "password" => null,
                     "confirmpassword" => null,
-                    "message" => "Username already used",
+                    "flashMessages" => [["Username already used"]],
                     "formstatus" => "error"
                 )
             );
@@ -73,7 +73,7 @@ class CreateUserAction extends UserAction
                     "contaminated" => $contaminated,
                     "password" => null,
                     "confirmpassword" => null,
-                    "message" => "Mail already used",
+                    "flashMessages" => [["Mail already used"]],
                     "formstatus" => "error"
                 )
             );
@@ -89,7 +89,7 @@ class CreateUserAction extends UserAction
 
         $this->logger->info("User has been created.");
 
-        $this->flash->addMessage('message', 'Your account has been created. Please log in.');
+        $this->flash->addMessage('creation', 'Your account has been created. Please log in.');
         return $this->response
             ->withHeader('Location', '/login')
             ->withStatus(302);
diff --git a/src/Application/Actions/User/LogInUserAction.php b/src/Application/Actions/User/LogInUserAction.php
index 69a1c05ac718ec55779b53307fdb69f3036d4840..b730269e42876ee3d19185bbc202b51c642c5e2a 100644
--- a/src/Application/Actions/User/LogInUserAction.php
+++ b/src/Application/Actions/User/LogInUserAction.php
@@ -20,15 +20,15 @@ class LogInUserAction extends UserAction
         $user = $this->userRepository->findOneBy(array('username' => $username));
 
         if (!isset($user)) {
-            $this->flash->addMessage('signup', 'Please sign up.');
+            $this->flash->addMessage('flashMessages', 'Unknown username or password.');
 
             return $this->response
-            ->withHeader('Location', '/signup')
+            ->withHeader('Location', '/login')
             ->withStatus(302);
         }
 
         if (!password_verify($password, $user->getPassword())) {
-            $_SESSION['message'] = 'Username or password unknown.';
+            $_SESSION['message'] = 'Unknown username or password.';
             return $this->twig->render($this->response, "/user/log_in.twig", ["formstatus" => "error", "session" => $_SESSION]);
         }
 
diff --git a/src/Application/Actions/User/NearContaminatedUsers.php b/src/Application/Actions/User/NearContaminatedUsers.php
index 1780babb86a1fc8e4ac1a42707b8b62181e26b92..b402551c0a466710a5d32d2d29d84024e3311819 100644
--- a/src/Application/Actions/User/NearContaminatedUsers.php
+++ b/src/Application/Actions/User/NearContaminatedUsers.php
@@ -30,7 +30,7 @@ class NearContaminatedUsers extends UserAction
     protected function action(): Response
     {
         if(!isset($_SESSION['userId'])){
-            $this->flash->addMessage('login', 'Please log in or sign up.');
+            $this->flash->addMessage('flashMessages', 'Please log in or sign up.');
 
             return $this->response
             ->withHeader('Location', '/login')