diff --git a/pms_api_rest/datamodels/pms_room_type.py b/pms_api_rest/datamodels/pms_room_type.py
index 314a143c5..48c4370ba 100644
--- a/pms_api_rest/datamodels/pms_room_type.py
+++ b/pms_api_rest/datamodels/pms_room_type.py
@@ -15,4 +15,5 @@ class PmsRoomTypeInfo(Datamodel):
     name = fields.String(required=False, allow_none=True)
     pmsPropertyIds = fields.List(fields.Integer(), required=False)
     defaultCode = fields.String(required=False, allow_none=True)
+    classId = fields.Integer(required=False, allow_none=True)
     price = fields.Float(required=False, allow_none=True)
diff --git a/pms_api_rest/services/pms_reservation_service.py b/pms_api_rest/services/pms_reservation_service.py
index 0dea752b1..7671bccb2 100644
--- a/pms_api_rest/services/pms_reservation_service.py
+++ b/pms_api_rest/services/pms_reservation_service.py
@@ -68,7 +68,7 @@ class PmsReservationService(Component):
                 if reservation.channel_type_id
                 else None,
                 agencyId=reservation.agency_id.id if reservation.agency_id else None,
-                userId=reservation.user_id.id,
+                userId=reservation.user_id.id if reservation.user_id else None,
                 checkin=datetime.combine(
                     reservation.checkin, datetime.min.time()
                 ).isoformat(),
diff --git a/pms_api_rest/services/pms_room_type_service.py b/pms_api_rest/services/pms_room_type_service.py
index 4615fa1a7..6f5dc5c25 100644
--- a/pms_api_rest/services/pms_room_type_service.py
+++ b/pms_api_rest/services/pms_room_type_service.py
@@ -60,6 +60,7 @@ class PmsRoomTypeService(Component):
                     pmsPropertyIds=room.pms_property_ids.mapped("id"),
                     defaultCode=room.default_code,
                     price=round(room.list_price, 2),
+                    classId=room.class_id,
                 )
             )
         return result_rooms