diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 907e2c8c9..47345b4c0 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -2339,33 +2339,25 @@ class SeedDMS_Core_DMS {
 
 	/**
 	 * This function should be replaced by getAllKeywordCategories()
+	 *
 	 * @param $userID
 	 * @return SeedDMS_Core_KeywordCategory[]|bool
 	 */
 	function getAllUserKeywordCategories($userID) { /* {{{ */
-		$queryStr = "SELECT * FROM `tblKeywordCategories`";
-		if ($userID != -1)
-			$queryStr .= " WHERE `owner` = " . (int) $userID;
-
-		$resArr = $this->db->getResultArray($queryStr);
-		if (is_bool($resArr) && !$resArr)
+		if (!is_numeric($userID) || $userID < 1)
 			return false;
-
-		$categories = array();
-		foreach ($resArr as $row) {
-			$cat = new SeedDMS_Core_KeywordCategory($row["id"], $row["owner"], $row["name"]);
-			$cat->setDMS($this);
-			array_push($categories, $cat);
-		}
-
-		return $categories;
+		return self::getAllKeywordCategories([$userID]);
 	} /* }}} */
 
 	function addKeywordCategory($userID, $name) { /* {{{ */
-		if (is_object($this->getKeywordCategoryByName($name, $userID))) {
+		if (!is_numeric($userID) || $userID < 1)
+			return false;
+		if(!trim($name))
+			return false;
+		if (is_object($this->getKeywordCategoryByName(trim($name), $userID))) {
 			return false;
 		}
-		$queryStr = "INSERT INTO `tblKeywordCategories` (`owner`, `name`) VALUES (".(int) $userID.", ".$this->db->qstr($name).")";
+		$queryStr = "INSERT INTO `tblKeywordCategories` (`owner`, `name`) VALUES (".(int) $userID.", ".$this->db->qstr(trim($name)).")";
 		if (!$this->db->getResult($queryStr))
 			return false;