diff --git a/core/authentication/resources/classes/plugins/database.php b/core/authentication/resources/classes/plugins/database.php
index 0344618626..311603089d 100644
--- a/core/authentication/resources/classes/plugins/database.php
+++ b/core/authentication/resources/classes/plugins/database.php
@@ -127,10 +127,15 @@ class plugin_database {
 			//}
 
 		//add the authentication details
-			if (isset($_REQUEST["username"]) && isset($_REQUEST["password"])) {
+			if (isset($_REQUEST["username"])) {
 				$this->username = $_REQUEST["username"];
+			}
+			if (isset($_REQUEST["password"])) {
 				$this->password = $_REQUEST["password"];
 			}
+			if (isset($_SESSION['username'])) {
+				$this->username = $_SESSION['username'];
+			}
 			if (isset($_REQUEST["key"])) {
 				$this->key = $_REQUEST["key"];
 			}