diff --git a/lib/security/permission.inc b/lib/security/permission.inc
index efa4a69..d136fa9 100644
--- a/lib/security/permission.inc
+++ b/lib/security/permission.inc
@@ -134,7 +134,7 @@ class Permission {
 		$sql->query("SELECT * FROM " . $default->owl_group_folders_table ." AS GFL INNER JOIN " . $default->owl_groups_users_link_table . " as GUL ON GFL.group_id = GUL.group_id " .
 					"INNER JOIN " . $default->owl_groups_table . " AS G ON G.ID = GFL.group_id " .
 					"WHERE GFL.folder_id = " . $iFolderID . " " .
-					"AND GUL.user_id = " . $_SESSION["user_id"] . " " .
+					"AND GUL.user_id = " . $_SESSION["userID"] . " " .
 					"AND G.Name = 'Unit Administrators' ");
 		if ($sql->next_record()) {
 			return true;
@@ -154,7 +154,7 @@ class Permission {
 	function userHasGroupWritePermissionForFolder($iFolderID) {
 		global $default, $lang_err_user_folder_write;
 		$sql = new Owl_DB();
-		$sql->query("SELECT * FROM " . $default->owl_groups_folders_table . " WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["user_id"] . " AND can_write = 1");
+		$sql->query("SELECT * FROM " . $default->owl_groups_folders_table . " WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["userID"] . " AND can_write = 1");
 		if ($sql->next_record()) {
 			return true;
 		}
@@ -172,7 +172,7 @@ class Permission {
 	function userHasGroupReadPermissionForFolder($iFolderID) {
 		global $default, $lang_err_user_folder_read;
 		$sql = new Owl_DB();
-		$sql->query("SELECT * FROM " . $default->owl_groups_folders_table = "groups_folders_link" . " WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["user_id"] . " AND can_read = 1");
+		$sql->query("SELECT * FROM " . $default->owl_groups_folders_table = "groups_folders_link" . " WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["userID"] . " AND can_read = 1");
 		if ($sql->next_record()) {
 			return true;
 		}
@@ -190,7 +190,7 @@ class Permission {
 	function userIsInGroupID($iGroupID) {		
 		global $default, $lang_err_user_group;
 		$sql = new Owl_DB();
-		$sql->query("SELECT id FROM " . $default->owl_groups_users_table . " WHERE id = " . $iGroupID . " AND user_id = " . $_SESSION["user_id"]);
+		$sql->query("SELECT id FROM " . $default->owl_groups_users_table . " WHERE id = " . $iGroupID . " AND user_id = " . $_SESSION["userID"]);
 		if ($sql->next_record()) {
 			return true;
 		}
@@ -208,7 +208,7 @@ class Permission {
 	function userIsInGroupName($sGroupName) {
 		global $default, $lang_err_user_group;
 		$sql = new Owl_DB();
-		$sql->query("SELECT id FROM " . $default->owl_groups_users_table . " AS GULT INNER JOIN " . $default->owl_groups_table . " AS G ON GULT.group_id = G.ID WHERE G.name = '" . $sGroupName . "' AND user_id = " . $_SESSION["user_id"]);
+		$sql->query("SELECT id FROM " . $default->owl_groups_users_table . " AS GULT INNER JOIN " . $default->owl_groups_table . " AS G ON GULT.group_id = G.ID WHERE G.name = '" . $sGroupName . "' AND user_id = " . $_SESSION["userID"]);
 		if ($sql->next_record()) {
 			return true;
 		}
@@ -227,7 +227,7 @@ class Permission {
 	function userHasWriteRoleForFolder($iFolderID) {
 		global $default, $lang_err_user_role;	
 		$sql = new Owl_DB();
-		$sql->query("SELECT * FROM " . $default->owl_folders_user_table . " AS FURL INNER JOIN " . $default->owl_role_table . " AS R ON FURL.role_id = R.id WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["user_id"] . " AND R.can_write = 1");
+		$sql->query("SELECT * FROM " . $default->owl_folders_user_table . " AS FURL INNER JOIN " . $default->owl_role_table . " AS R ON FURL.role_id = R.id WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["userID"] . " AND R.can_write = 1");
 		if ($sql->next_record()) {
 			return true;
 		}
@@ -245,7 +245,7 @@ class Permission {
 	function userHasReadRoleForFolder($iFolderID) {
 		global $default, $lang_err_user_role;	
 		$sql = new Owl_DB();
-		$sql->query("SELECT * FROM " . $default->owl_folders_user_table . " AS FURL INNER JOIN " . $default->owl_role_table . " AS R ON FURL.role_id = R.id WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["user_id"] . " AND R.can_read = 1");
+		$sql->query("SELECT * FROM " . $default->owl_folders_user_table . " AS FURL INNER JOIN " . $default->owl_role_table . " AS R ON FURL.role_id = R.id WHERE folder_id = " . $iFolderID . " AND user_id = " . $_SESSION["userID"] . " AND R.can_read = 1");
 		if ($sql->next_record()) {
 			return true;
 		}
diff --git a/tests/foldermanagement/folderManager.php b/tests/foldermanagement/folderManager.php
index 9b642e5..94cbeff 100644
--- a/tests/foldermanagement/folderManager.php
+++ b/tests/foldermanagement/folderManager.php
@@ -29,7 +29,7 @@ if (checkSession()) {
 	
 	//check creation of a duplicate folder
 	echo "<b>Testing creation of duplicate folder</b><br>";
-	if (!FolderManager::createFolder("Test folder", "This is another a test' %//^&* folder", -1, $_SESSION["user_id"], 1, 1, true)) {
+	if (!FolderManager::createFolder("Test folder", "This is another a test' %//^&* folder", -1, $_SESSION["userID"], 1, 1, true)) {
 		echo "Passed creation of duplicate folder test<br>";
 	} else {
 		echo "Failed creation of a dupliate folder test: " . $_SESSION["errorMessage"] . "<br>";