diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4deea815..62e2f6928 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Orders : Add a simple order archive batch on 30d,
 fix possible warning DOMDocument::loadHTML(): Tag figure invalid in Entity with ckeditor
 Move security check inside Modules
 Move securityPro inside Modules
+add ckeditor 5.x
 
 -------------
 Version 3.319
diff --git a/includes/ClicShopping/Apps/Catalog/Manufacturers/Sites/ClicShoppingAdmin/Pages/Home/templates/edit.php b/includes/ClicShopping/Apps/Catalog/Manufacturers/Sites/ClicShoppingAdmin/Pages/Home/templates/edit.php
index 3076c2af3..ace680847 100755
--- a/includes/ClicShopping/Apps/Catalog/Manufacturers/Sites/ClicShoppingAdmin/Pages/Home/templates/edit.php
+++ b/includes/ClicShopping/Apps/Catalog/Manufacturers/Sites/ClicShoppingAdmin/Pages/Home/templates/edit.php
@@ -35,9 +35,7 @@
   $page = (isset($_GET['page']) && is_numeric($_GET['page'])) ? (int)$_GET['page'] : 1;
 
   echo HTMLOverrideAdmin::getCkeditor();
-  echo HTML::form('manufacturers', $CLICSHOPPING_Manufacturers->link('Manufacturers&' . $form_action . $variable));
 ?>
-
 <div class="contentBody">
   <div class="row">
     <div class="col-md-12">
@@ -49,6 +47,7 @@ class="col-md-1 logoHeading"><?php echo HTML::image($CLICSHOPPING_Template->getI
             class="col-md-4 pageHeading"><?php echo '&nbsp;' . $CLICSHOPPING_Manufacturers->getDef('heading_title'); ?></span>
           <span class="col-md-7 text-end">
 <?php
+  echo HTML::form('manufacturers', $CLICSHOPPING_Manufacturers->link('Manufacturers&' . $form_action . $variable));
   if ($form_action == 'Update') echo HTML::hiddenField('manufacturers_id', HTML::sanitize($_GET['mID']));
 
   echo HTML::button($CLICSHOPPING_Manufacturers->getDef('button_cancel'), null, $CLICSHOPPING_Manufacturers->link('Manufacturers&page=' . $page . $variable), 'warning') . '&nbsp;';
@@ -61,7 +60,7 @@ class="col-md-4 pageHeading"><?php echo '&nbsp;' . $CLICSHOPPING_Manufacturers->
   </div>
   <div class="separator"></div>
   <?php
-    if ((isset($_GET['Edit']) && isset($_GET['mID']) && !empty($_GET['mID']))) {
+    if (isset($_GET['Edit']) && isset($_GET['mID']) && !empty($_GET['mID'])) {
       $Qmanufacturers = $CLICSHOPPING_Manufacturers->db->prepare('select m.manufacturers_id,
                                                                          m.manufacturers_name,
                                                                          m.manufacturers_image,
@@ -84,6 +83,8 @@ class="col-md-4 pageHeading"><?php echo '&nbsp;' . $CLICSHOPPING_Manufacturers->
       $Qmanufacturers->bindInt(':manufacturers_id', $_GET['mID']);
       $Qmanufacturers->execute();
 
+      $manufacturers = $Qmanufacturers->fetch();
+      
       $mInfo = new ObjectInfo($Qmanufacturers->toArray());
     } else {
       $mInfo = new ObjectInfo(array());
diff --git a/includes/ClicShopping/Sites/ClicShoppingAdmin/HTMLOverrideAdmin.php b/includes/ClicShopping/Sites/ClicShoppingAdmin/HTMLOverrideAdmin.php
index d73f9dc1b..ee582ebdd 100644
--- a/includes/ClicShopping/Sites/ClicShoppingAdmin/HTMLOverrideAdmin.php
+++ b/includes/ClicShopping/Sites/ClicShoppingAdmin/HTMLOverrideAdmin.php
@@ -14,7 +14,7 @@
   use ClicShopping\OM\HTML;
   use ClicShopping\OM\Registry;
   use ClicShopping\OM\CLICSHOPPING;
-  use ClicShopping\OM\Language;
+  use ClicShopping\OM\HTTP;
 
   class HTMLOverrideAdmin extends HTML
   {
@@ -68,7 +68,7 @@ public static function getCkeditorLanguage() :string
      */
     private static function getElFinderConnector() :string
     {
-      $connector =  '../ext/elFinder-master/php/connector.minimal.php';
+      $connector = HTTP::getShopUrlDomain() . 'ext/elFinder-master/php/connector.minimal.php';
 
       return $connector;
     }