diff --git a/admin/themes/default/template/controllers/products/configuration.tpl b/admin/themes/default/template/controllers/products/configuration.tpl
index 61e5e168d..21e63328b 100644
--- a/admin/themes/default/template/controllers/products/configuration.tpl
+++ b/admin/themes/default/template/controllers/products/configuration.tpl
@@ -409,7 +409,7 @@
                     html += '</select>';
                 html += '</td>';
                 html += '<td class="col-sm-3 center">';
-                    html += '<input class="form-control" type="text" name="'+prefix+'[floor]">';
+                    html += '<input class="form-control" type="text" name="'+prefix+'[comment]">';
                 html += '</td>';
                 html += '<td class="center col-sm-2">';
                     html += '<a class="btn btn-default deactiveDatesModal disabled" data-toggle="modal" data-target="#deactiveDatesModal">';
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index d31f6b3f4..3dc7ccdda 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -3497,10 +3497,10 @@ class AdminProductsControllerCore extends AdminController
                         }
                         $objHotelRoomInfo->id_product = $id_product;
                         $objHotelRoomInfo->id_hotel = $id_hotel;
-                        $objHotelRoomInfo->room_num = $roomInfo['room_num'];
+                        $objHotelRoomInfo->room_num = trim($roomInfo['room_num']);
                         $objHotelRoomInfo->id_status = $roomInfo['id_status'];
-                        $objHotelRoomInfo->floor = $roomInfo['floor'];
-                        $objHotelRoomInfo->comment = $roomInfo['comment'];
+                        $objHotelRoomInfo->floor = trim($roomInfo['floor']);
+                        $objHotelRoomInfo->comment = trim($roomInfo['comment']);
                         if ($objHotelRoomInfo->save()
                             && $objHotelRoomInfo->id_status != HotelRoomInformation::STATUS_TEMPORARY_INACTIVE
                         ) {
@@ -3536,7 +3536,7 @@ class AdminProductsControllerCore extends AdminController
                     }
                 }
 
-                if ($roomInfo['room_num'] && !Validate::isGenericName($roomInfo['room_num'])) {
+                if (empty(trim($roomInfo['room_num'])) || !Validate::isGenericName($roomInfo['room_num'])) {
                     $this->errors[] = sprintf(Tools::displayError('Invalid room number for room %s.'), $roomIndex);
                 }