diff --git a/Application/Controller/Admin/ManufacturerInfoLongdesc.php b/Application/Controller/Admin/ManufacturerInfoLongdesc.php
index 777e98a..c02b49d 100644
--- a/Application/Controller/Admin/ManufacturerInfoLongdesc.php
+++ b/Application/Controller/Admin/ManufacturerInfoLongdesc.php
@@ -24,18 +24,16 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
 		$sOXID = $this->_aViewData["oxid"] = $this->getEditObjectId();
 		if (isset($sOXID) && $sOXID != "-1") {
 			// load object
-			$d3manufacturerlang = \OxidEsales\Eshop\Core\Registry::getConfig()->getRequestParameter("d3manufacturerlang");
+			$d3manufacturerlang = \OxidEsales\Eshop\Core\Registry::getConfig()->getRequestParameter("catlang");
 			
 			if (!isset($d3manufacturerlang)) {
 				$d3manufacturerlang = $this->_iEditLang;
 			}
 			
-			$this->_aViewData["d3manufacturerlang"] = $d3manufacturerlang;
+			$this->_aViewData["catlang"] = $d3manufacturerlang;
 			
 			$oManufacturer->loadInLang($d3manufacturerlang, $sOXID);
 			
-
-			
 			//Disable editing for derived items
 			if ($oManufacturer->isDerived()) {
 				$this->_aViewData['readonly'] = true;
@@ -62,6 +60,7 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
 	{
 		parent::save();
 		
+		$iManufacturerLang = intval(\OxidEsales\Eshop\Core\Registry::getConfig()->getRequestParameter("catlang"));
 		$sOXID = $this->getEditObjectId();
 		$this->setEditObjectId($sOXID);
 		
@@ -71,7 +70,7 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
 		
 		/** @var Manufacturer|D3ManufacturerLongDesc $oManufacturer */
 		$oManufacturer = oxNew(Manufacturer::class);
-		$oManufacturer->setLanguage($this->_iEditLang);
+		$oManufacturer->loadInLang($iManufacturerLang, $sOXID);
 		
 		if (!$oManufacturer->load($sOXID)) {
 			return;
@@ -80,7 +79,6 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
 		$aParams = Registry::getRequest()->getRequestEscapedParameter("editval");
 		$oManufacturer->assign($aParams);
 		
-		// default longdesc can parsed only, if longtext #1 is selected, all other longtext selections don't contains its value
 		if (false === is_null($this->d3GetLongdescParamValue())) {
 			$oManufacturer->d3SetLongdesc($this->d3GetLongdescParamValue());
 			$oManufacturer->save();
@@ -96,11 +94,12 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
 	 * @return string
 	 * @deprecated underscore prefix violates PSR12, will be renamed to "getEditValue" in next major
 	 */
-	protected function _getEditValue($oObject, $sField) // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+	protected function _getEditValue($oManufacturer, $sField) // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
 	{
 		$sEditObjectValue = '';
-		if ($oObject) {
-			$sEditObjectValue = $this->_processEditValue($oObject->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME));
+		
+		if ($oManufacturer and $oManufacturer->getId()) {
+			$sEditObjectValue = $this->_processEditValue($oManufacturer->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME));
 		}
 		
 		return $sEditObjectValue;
@@ -111,7 +110,7 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
 	 */
 	public function d3GetLongdescParamValue() :string
 	{
-		return $aParams = Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__D3DESCRIPTION'];
+		return (string) $aParams = Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__D3DESCRIPTION'];
 	}
 	
 	/**