diff --git a/classes/order/OrderHistory.php b/classes/order/OrderHistory.php
index 874171009..1d09988c0 100644
--- a/classes/order/OrderHistory.php
+++ b/classes/order/OrderHistory.php
@@ -449,7 +449,7 @@ class OrderHistoryCore extends ObjectModel
             );
 
             if ($idHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id)) {
-                $objHotelBranchInformation = new HotelBranchInformation($idHotel, $order->id_lang);
+                $objHotelBranchInformation = new HotelBranchInformation($idHotel);
                 $fields = array_merge(
                     $objHotelBranchInformation->getFields(),
                     $objHotelBranchInformation->getFieldsLang()[$order->id_lang],
diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index 8b53e911c..108b51a75 100644
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -45,8 +45,8 @@ class AdminCartsControllerCore extends AdminController
 
         $this->_select = 'CONCAT(c.`firstname`, \' \', c.`lastname`) `customer`, a.id_cart total,
         TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', a.`date_add`)) AS `time_diff`,
-        IFNULL(GROUP_CONCAT(o.`id_order`), 0) AS `ids_order`,
-        IF (IFNULL(o.id_order, \''.$this->l('Non ordered cart').'\') = \''.$this->l('Non ordered cart').'\', IF(TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', a.`date_add`)) > 86400, \''.$this->l('Abandoned cart').'\', \''.$this->l('Non ordered cart').'\'), GROUP_CONCAT(o.`id_order`)) AS filter_ids_order,
+        IFNULL(GROUP_CONCAT(DISTINCT o.`id_order`), 0) AS `ids_order`,
+        IF (IFNULL(o.id_order, \''.$this->l('Non ordered cart').'\') = \''.$this->l('Non ordered cart').'\', IF(TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', a.`date_add`)) > 86400, \''.$this->l('Abandoned cart').'\', \''.$this->l('Non ordered cart').'\'), GROUP_CONCAT(DISTINCT o.`id_order`)) AS filter_ids_order,
 		IF(o.id_order, 1, 0) badge_success, IF(o.id_order, 0, 1) badge_danger, IF(co.id_guest, 1, 0) id_guest';
         $this->_join = 'LEFT JOIN '._DB_PREFIX_.'customer c ON (c.id_customer = a.id_customer)
 		LEFT JOIN '._DB_PREFIX_.'currency cu ON (cu.id_currency = a.id_currency)
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 811207d39..7123dbbf4 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -1089,16 +1089,18 @@ class AdminProductsControllerCore extends AdminController
             }
 
             $id_product = Tools::getValue('id_product');
-
             $id_adv_pmt = Tools::getValue('id_adv_pmt');
             if ($id_adv_pmt) {
                 $obj_adv_pmt = new HotelAdvancedPayment($id_adv_pmt);
             } else {
                 $obj_adv_pmt = new HotelAdvancedPayment();
+                if ($adv_pmt_info = $obj_adv_pmt->getIdAdvPaymentByIdProduct($id_product)) {
+                    // To prevent duplication from two separate tabs
+                    $obj_adv_pmt = new HotelAdvancedPayment((int) $adv_pmt_info['id']);
+                }
             }
 
             $adv_payment_active = Tools::getValue('adv_payment_active');
-
             $obj_adv_pmt->id_product = $id_product;
             $obj_adv_pmt->active = $adv_payment_active;
 
diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php
index ab05a2876..e7017e12f 100644
--- a/controllers/front/GuestTrackingController.php
+++ b/controllers/front/GuestTrackingController.php
@@ -92,10 +92,11 @@ class GuestTrackingControllerCore extends FrontController
                     $customer = new Customer((int)$order->id_customer);
                     if (!Validate::isLoadedObject($customer)) {
                         $this->errors[] = Tools::displayError('Invalid customer');
-                    } elseif (!Tools::getValue('password')) {
+                    } elseif (!Tools::getValue('password')
+                        || !Validate::isPasswd(Tools::getValue('password')
+                    )) {
                         $this->errors[] = Tools::displayError('Invalid password.');
                     } elseif (!$customer->transformToCustomer($this->context->language->id, Tools::getValue('password'))) {
-                        // @todo clarify error message
                         $this->errors[] = Tools::displayError('An error occurred while transforming a guest into a registered customer.');
                     } else {
                         $this->context->smarty->assign('transformSuccess', true);
diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index 465c6a7ca..2cd2a223c 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -173,7 +173,9 @@ class OrderOpcControllerCore extends ParentOrderController
 
                             if (!count($this->errors)) {
                                 $customer = new Customer($this->context->customer->id);
-                                if ($customer->transformToCustomer($this->context->language->id, $passwd)) {
+                                if (!$customer->isGuest()) {
+                                    $this->errors[] = Tools::displayError('This account is already registered as a customer.');
+                                } else if ($customer->transformToCustomer($this->context->language->id, $passwd)) {
                                     $this->context->updateCustomer($customer);
                                 } else {
                                     $this->errors[] = Tools::displayError('An error occurred while transforming your account into a registered customer.');
diff --git a/modules/hotelreservationsystem/classes/HotelAdvancedPayment.php b/modules/hotelreservationsystem/classes/HotelAdvancedPayment.php
index 1cc539d75..076663010 100644
--- a/modules/hotelreservationsystem/classes/HotelAdvancedPayment.php
+++ b/modules/hotelreservationsystem/classes/HotelAdvancedPayment.php
@@ -68,7 +68,7 @@ class HotelAdvancedPayment extends ObjectModel
      */
     public function getIdAdvPaymentByIdProduct($id_product)
     {
-        $result = Db::getInstance()->getRow("SELECT * FROM `"._DB_PREFIX_."htl_advance_payment` WHERE `id_product`=".$id_product);
+        $result = Db::getInstance()->getRow("SELECT * FROM `"._DB_PREFIX_."htl_advance_payment` WHERE `id_product`=".(int) $id_product);
 
         if ($result) {
             return $result;
diff --git a/modules/hotelreservationsystem/views/templates/hook/copyRight.tpl b/modules/hotelreservationsystem/views/templates/hook/copyRight.tpl
index f8e052770..790a4a52c 100644
--- a/modules/hotelreservationsystem/views/templates/hook/copyRight.tpl
+++ b/modules/hotelreservationsystem/views/templates/hook/copyRight.tpl
@@ -1,5 +1,5 @@
 <div class="copyRightWrapper">
 	<p class="copyRight">
-		&copy; {$WK_HTL_ESTABLISHMENT_YEAR}-{'Y'|date}&nbsp;<a href="{$base_dir}">&nbsp;{$WK_HTL_CHAIN_NAME}</a>.&nbsp;{l s=' All rights reserved.' mod='hotelreservationsystem'}
+		&copy;{if isset($WK_HTL_ESTABLISHMENT_YEAR) && $WK_HTL_ESTABLISHMENT_YEAR} {$WK_HTL_ESTABLISHMENT_YEAR}-{'Y'|date}&nbsp;{/if}<a href="{$base_dir}">&nbsp;{$WK_HTL_CHAIN_NAME}</a>.&nbsp;{l s=' All rights reserved.' mod='hotelreservationsystem'}
 	</p>
 </div>
\ No newline at end of file