diff --git a/www/includes/table_arrays/array_edit_users.php b/www/includes/table_arrays/array_edit_users.php
index 0985507c..7e1fcb94 100644
--- a/www/includes/table_arrays/array_edit_users.php
+++ b/www/includes/table_arrays/array_edit_users.php
@@ -331,10 +331,11 @@ $edit_users = [
 		// if base acl is not 90 only list enabled
 		// if not admin flag, do not list admin flagged
 		. (
-			!$_POST['acl_admin'] ?
+			!$this->getAclAdmin() ?
 				"WHERE admin = 0 "
 				. (
-					$_POST['base_acl_level'] < 90 ?
+					!$this->checkBaseACL(90) ?
+					// $_POST['base_acl_level'] < 90 ?
 						"AND enabled = 1 " :
 						""
 				)
diff --git a/www/lib/CoreLibs/Output/Form/Generate.php b/www/lib/CoreLibs/Output/Form/Generate.php
index 94e2c83c..d96f1934 100644
--- a/www/lib/CoreLibs/Output/Form/Generate.php
+++ b/www/lib/CoreLibs/Output/Form/Generate.php
@@ -474,6 +474,27 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 
 	// PUBLIC METHODS |=================================================>
 
+	/**
+	 * return current acl admin flag (1/0)
+	 *
+	 * @return int Admin flag 1 for on or 0 for off
+	 */
+	public function getAclAdmin(): int
+	{
+		return $this->acl_admin;
+	}
+
+	/**
+	 * check if current acl level is match to requested on
+	 *
+	 * @param  int  $level Requested ACL level
+	 * @return bool        if current level equal or larger return tru, else false
+	 */
+	public function checkBaseACL(int $level): bool
+	{
+		return $this->base_acl_level >= $level ? true : false;
+	}
+
 	/**
 	 * dumps all values into output (for error msg)
 	 *