diff --git a/application/Libraries/Aauth.php b/application/Libraries/Aauth.php
index 8cbc77f..5d5d9b7 100644
--- a/application/Libraries/Aauth.php
+++ b/application/Libraries/Aauth.php
@@ -938,11 +938,14 @@ class Aauth
 	{
 		if ($includeNonFlash)
 		{
-			$this->flashErrors = array_merge($this->flashErrors, $this->errors);
+			$this->flashErrors = array_merge($this->session->getFlashdata('errors'), $this->errors);
+			$this->session->setFlashdata('errors', $this->flashErrors);
+		}
+		else
+		{
+			$this->session->keepFlashdata('errors');
 		}
 
-		$this->flashErrors = array_merge($this->flashErrors, (array)$this->session->getFlashdata('errors'));
-		$this->session->setFlashdata('errors', $this->flashErrors);
 	}
 
 	/**
@@ -1049,10 +1052,13 @@ class Aauth
 		if ($includeNonFlash)
 		{
 			$this->flashInfos = array_merge($this->flashInfos, $this->infos);
+			$this->flashInfos = array_merge($this->session->getFlashdata('infos'), $this->errors);
+			$this->session->setFlashdata('infos', $this->flashInfos);
+		}
+		else
+		{
+			$this->session->keepFlashdata('infos');
 		}
-
-		$this->flashInfos = array_merge($this->flashInfos, (array)$this->session->getFlashdata('infos'));
-		$this->session->setFlashdata('infos', $this->flashInfos);
 	}
 
 	/**
diff --git a/tests/Aauth/Libraries/Aauth/LoginTest.php b/tests/Aauth/Libraries/Aauth/LoginTest.php
index 51276bc..4f5c788 100644
--- a/tests/Aauth/Libraries/Aauth/LoginTest.php
+++ b/tests/Aauth/Libraries/Aauth/LoginTest.php
@@ -1,9 +1,11 @@
 <?php namespace Tests\Aauth\Libraries\Aauth;
 
 use Config\Aauth as AauthConfig;
+use Config\App;
 use Config\Logger;
 use Config\Services;
 use Tests\Support\Log\TestLogger;
+use Tests\Support\HTTP\MockResponse;
 use Tests\Support\Session\MockSession;
 use CodeIgniter\Session\Handlers\FileHandler;
 use CodeIgniter\Test\CIDatabaseTestCase;
@@ -27,6 +29,8 @@ class LoginTest extends CIDatabaseTestCase
     {
         parent::setUp();
 
+        Services::injectMock('response', new MockResponse(new App()));
+        $this->response = service('response');
 	    $this->library = new Aauth(null, true);
         $_COOKIE = [];
         $_SESSION = [];