diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
index 0e16fb730..eaf06a72f 100644
--- a/pms/controllers/pms_portal.py
+++ b/pms/controllers/pms_portal.py
@@ -302,10 +302,12 @@ class PortalPrecheckin(CustomerPortal):
 
     @http.route(["/my/precheckin"], type="http", auth="user", website=True, csrf=False)
     def portal_precheckin_submit(self, **kw):
-        if "id" in kw:
-            checkin_partner = request.env["pms.checkin.partner"].browse(
-                int(kw.get("id"))
-            )
-            checkin_partner.write(kw)
-
-        # return request.render("pms.portal_my_reservation_precheckin", kw)
+        checkin_partner = request.env["pms.checkin.partner"].browse(int(kw.get("id")))
+        checkin_partner.write(kw)
+        reservation = request.env["pms.reservation"].browse(
+            checkin_partner.reservation_id
+        )
+        values = {
+            "reservation": reservation.id,
+        }
+        return request.render("pms.portal_my_reservation_precheckin", values)
diff --git a/pms/views/folio_portal_templates.xml b/pms/views/folio_portal_templates.xml
index 13901751b..29081f2d9 100644
--- a/pms/views/folio_portal_templates.xml
+++ b/pms/views/folio_portal_templates.xml
@@ -516,123 +516,170 @@
                                         Checkin
                                 </a>
                                     <div class="row o_portal_details">
-                    <div class="col-lg-8">
-                        <div class="row">
-                            <div t-attf-class="form-group col-xl-6">
-                                <label class="col-form-label" for="name">Name</label>
-                                <input
+                                       <div class="col-lg-8">
+                                            <div class="row">
+                                                <div t-attf-class="form-group col-xl-6">
+                                                    <label
+                                                        class="col-form-label"
+                                                        for="firstname"
+                                                    >Name</label>
+                                                    <input
                                                         type="text"
-                                                        name="name"
+                                                        name="firstname"
                                                         t-attf-class="form-control"
                                                         t-att-value="name or checkin_partner.firstname"
                                                     />
-                            </div>
-                            <div t-attf-class="form-group col-xl-6">
-                                <label
+                                                </div>
+                                                <div t-attf-class="form-group col-xl-6">
+                                                    <label
                                                         class="col-form-label"
-                                                        for="name"
+                                                        for="lastname"
                                                     >Lastname</label>
-                                <input
+                                                    <input
                                                         type="text"
                                                         name="lastname"
                                                         t-attf-class="form-control"
                                                         t-att-value="lastname or checkin_partner.lastname"
                                                     />
-                            </div>
-                            <div t-attf-class="form-group col-xl-6">
-                                <label
+                                                </div>
+                                                <div t-attf-class="form-group col-xl-6">
+                                                    <label
                                                         class="col-form-label"
-                                                        for="name"
+                                                        for="lastname2"
                                                     > Second Lastname</label>
-                                <input
+                                                    <input
                                                         type="text"
-                                                        name="second_lastname"
+                                                        name="lastname2"
                                                         t-attf-class="form-control"
                                                         t-att-value="lastname2 or checkin_partner.lastname2"
                                                     />
-                            </div>
-                            <div t-attf-class="form-group col-xl-6">
-                                <label
+                                                </div>
+                                                <div t-attf-class="form-group col-xl-6">
+                                                    <label
                                                         class="col-form-label"
-                                                        for="name"
+                                                        for="birthdate_date"
                                                     > Birth Date</label>
-                                <input
+                                                    <input
                                                         type="text"
-                                                        name="birth_date"
+                                                        name="birthdate_date"
                                                         t-attf-class="form-control"
                                                         t-att-value="birth_date or checkin_partner.birthdate_date"
                                                     />
-                            </div>
-                            <div t-attf-class="form-group col-xl-6">
-                                <label class="col-form-label" for="name">Gender</label>
-                                <input
-                                                        type="text"
+                                                </div>
+                                                <div t-attf-class="form-group col-xl-6">
+                                                    <label
+                                                        class="col-form-label"
+                                                        for="gender"
+                                                    >Gender</label>
+                                                    <select
+                                                        class="form-control"
+                                                        id="gender"
                                                         name="gender"
-                                                        t-attf-class="form-control"
-                                                        t-att-value="gender or checkin_partner.gender"
-                                                    />
-                            </div>
-                            <div t-attf-class="form-group col-xl-6">
-                                <label
+                                                    >
+                                                        <option
+                                                            value="female"
+                                                        >Female</option>
+                                                        <option
+                                                            value="male"
+                                                        >Male</option>
+                                                        <option
+                                                            value="other"
+                                                        >Other</option>
+                                                    </select>
+                                                </div>
+                                                <div t-attf-class="form-group col-xl-6">
+                                                    <label
                                                         class="col-form-label"
-                                                        for="name"
+                                                        for="document_type"
                                                     >Doc. type</label>
-                                <input
-                                                        type="text"
-                                                        name="doc_type"
-                                                        t-attf-class="form-control"
-                                                        t-att-value="doc_type or checkin_partner.document_type"
-                                                    />
-                            </div>
-                            <div t-attf-class="form-group col-xl-6">
-                                <label
+                                                    <select
+                                                        class="form-control"
+                                                        id="doc_type_id"
+                                                        name="document_type"
+                                                    >
+                                                        <option value="D">DNI</option>
+                                                        <option
+                                                            value="C"
+                                                        >Driving License</option>
+                                                        <option
+                                                            value="I"
+                                                        >Identification Document</option>
+                                                        <option
+                                                            value="N"
+                                                        >Spanish residence permit</option>
+                                                        <option
+                                                            value="X"
+                                                        >European residence permit</option>
+                                                   </select>
+                                                </div>
+                                                <div t-attf-class="form-group col-xl-6">
+                                                    <label
                                                         class="col-form-label"
-                                                        for="name"
+                                                        for="document_number"
                                                     >Doc. number</label>
-                                <input
+                                                    <input
                                                         type="text"
-                                                        name="doc_number"
+                                                        name="document_number"
                                                         t-attf-class="form-control"
                                                         t-att-value="doc_number or checkin_partner.document_number"
                                                     />
-                            </div>
-                            <div t-attf-class="form-group col-xl-6">
-                                <label
+                                                </div>
+                                                <div t-attf-class="form-group col-xl-6">
+                                                    <label
                                                         class="col-form-label"
-                                                        for="name"
+                                                        for="document_expedition_date"
                                                     >Doc. expedition date</label>
-                                <input
+                                                    <input
                                                         type="text"
-                                                        name="doc_exp_date"
+                                                        name="document_expedition_date"
                                                         t-attf-class="form-control"
                                                         t-att-value="doc_exp_date or checkin_partner.document_expedition_date"
                                                     />
-                            </div>
-                            <div t-attf-class="form-group col-xl-6">
-                                <label class="col-form-label" for="name">Mobile</label>
-                                <input
+                                                </div>
+                                                <div t-attf-class="form-group col-xl-6">
+                                                    <label
+                                                        class="col-form-label"
+                                                        for="mobile"
+                                                    >Mobile</label>
+                                                    <input
                                                         type="text"
                                                         name="mobile"
                                                         t-attf-class="form-control"
                                                         t-att-value="mobile or checkin_partner.mobile"
                                                     />
-                            </div>
-                            <div t-attf-class="form-group col-xl-6">
-                                <label class="col-form-label" for="name">Email</label>
-                                <input
+                                                </div>
+                                                <div t-attf-class="form-group col-xl-6">
+                                                    <label
+                                                        class="col-form-label"
+                                                        for="email"
+                                                    >Email</label>
+                                                    <input
                                                         type="text"
                                                         name="email"
                                                         t-attf-class="form-control"
                                                         t-att-value="email or checkin_partner.email"
                                                     />
-                            </div>
-                        </div>
-                    </div>
-                </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </td>
                             </tr>
                         </t>
                     </t>
+                    <tr>
+                        <td>
+                            <div class="clearfix">
+                                <button
+                                    type="submit"
+                                    class="btn btn-primary float-right mb32 "
+                                >
+                                    Confirm
+                                    <span class="fa fa-long-arrow-right" />
+                                </button>
+                            </div>
+                        </td>
+                    </tr>
                 </tbody>
             </t>
       </t>
diff --git a/pms/views/precheckin_portal_templates.xml b/pms/views/precheckin_portal_templates.xml
index bc3af4d9b..6ad62c20d 100644
--- a/pms/views/precheckin_portal_templates.xml
+++ b/pms/views/precheckin_portal_templates.xml
@@ -69,24 +69,28 @@
                                     class="col-form-label"
                                     for="gender"
                                 >Gender</label>
-                                <input
-                                    type="text"
-                                    name="gender"
-                                    t-attf-class="form-control"
-                                    t-att-value="gender or checkin_partner.gender"
-                                />
+                                <select class="form-control" id="gender" name="gender">
+                                    <option value="female">Female</option>
+                                    <option value="male">Male</option>
+                                    <option value="other">Other</option>
+                                </select>
                             </div>
                             <div t-attf-class="form-group col-xl-6">
                                 <label
                                     class="col-form-label"
                                     for="document_type"
                                 >Doc. type</label>
-                                <input
-                                    type="text"
+                                <select
+                                    class="form-control"
+                                    id="doc_type_id"
                                     name="document_type"
-                                    t-attf-class="form-control"
-                                    t-att-value="doc_type or checkin_partner.document_type"
-                                />
+                                >
+                                    <option value="D">DNI</option>
+                                    <option value="C">Driving License</option>
+                                    <option value="I">Identification Document</option>
+                                    <option value="N">Spanish residence permit</option>
+                                    <option value="X">European residence permit</option>
+                               </select>
                             </div>
                             <div t-attf-class="form-group col-xl-6">
                                 <label
diff --git a/pms/views/reservation_portal_templates.xml b/pms/views/reservation_portal_templates.xml
index ff87d70ac..18971ee94 100644
--- a/pms/views/reservation_portal_templates.xml
+++ b/pms/views/reservation_portal_templates.xml
@@ -314,11 +314,11 @@
                                             <div t-attf-class="form-group col-xl-6">
                                                 <label
                                                     class="col-form-label"
-                                                    for="name"
+                                                    for="firstname"
                                                 >Name</label>
                                                 <input
                                                     type="text"
-                                                    name="name"
+                                                    name="firstname"
                                                     t-attf-class="form-control"
                                                     t-att-value="name or checkin_partner.firstname"
                                                 />
@@ -326,7 +326,7 @@
                                             <div t-attf-class="form-group col-xl-6">
                                                 <label
                                                     class="col-form-label"
-                                                    for="name"
+                                                    for="lastname"
                                                 >Lastname</label>
                                                 <input
                                                     type="text"
@@ -338,11 +338,11 @@
                                             <div t-attf-class="form-group col-xl-6">
                                                 <label
                                                     class="col-form-label"
-                                                    for="name"
+                                                    for="lastname2"
                                                 > Second Lastname</label>
                                                 <input
                                                     type="text"
-                                                    name="second_lastname"
+                                                    name="lastname2"
                                                     t-attf-class="form-control"
                                                     t-att-value="lastname2 or checkin_partner.lastname2"
                                                 />
@@ -350,11 +350,11 @@
                                             <div t-attf-class="form-group col-xl-6">
                                                 <label
                                                     class="col-form-label"
-                                                    for="name"
+                                                    for="birthdate_date"
                                                 > Birth Date</label>
                                                 <input
                                                     type="text"
-                                                    name="birth_date"
+                                                    name="birthdate_date"
                                                     t-attf-class="form-control"
                                                     t-att-value="birth_date or checkin_partner.birthdate_date"
                                                 />
@@ -362,35 +362,53 @@
                                             <div t-attf-class="form-group col-xl-6">
                                                 <label
                                                     class="col-form-label"
-                                                    for="name"
+                                                    for="gender"
                                                 >Gender</label>
-                                                <input
-                                                    type="text"
+                                                <select
+                                                    class="form-control"
+                                                    id="gender"
                                                     name="gender"
-                                                    t-attf-class="form-control"
-                                                    t-att-value="gender or checkin_partner.gender"
-                                                />
+                                                >
+                                                    <option
+                                                        value="female"
+                                                    >Female</option>
+                                                    <option value="male">Male</option>
+                                                    <option value="other">Other</option>
+                                                </select>
                                             </div>
                                             <div t-attf-class="form-group col-xl-6">
                                                 <label
                                                     class="col-form-label"
-                                                    for="name"
+                                                    for="document_type"
                                                 >Doc. type</label>
-                                                <input
-                                                    type="text"
-                                                    name="doc_type"
-                                                    t-attf-class="form-control"
-                                                    t-att-value="doc_type or checkin_partner.document_type"
-                                                />
+                                                <select
+                                                    class="form-control"
+                                                    id="doc_type_id"
+                                                    name="document_type"
+                                                >
+                                                    <option value="D">DNI</option>
+                                                    <option
+                                                        value="C"
+                                                    >Driving License</option>
+                                                    <option
+                                                        value="I"
+                                                    >Identification Document</option>
+                                                    <option
+                                                        value="N"
+                                                    >Spanish residence permit</option>
+                                                    <option
+                                                        value="X"
+                                                    >European residence permit</option>
+                                               </select>
                                             </div>
                                             <div t-attf-class="form-group col-xl-6">
                                                 <label
                                                     class="col-form-label"
-                                                    for="name"
+                                                    for="document_number"
                                                 >Doc. number</label>
                                                 <input
                                                     type="text"
-                                                    name="doc_number"
+                                                    name="document_number"
                                                     t-attf-class="form-control"
                                                     t-att-value="doc_number or checkin_partner.document_number"
                                                 />
@@ -398,11 +416,11 @@
                                             <div t-attf-class="form-group col-xl-6">
                                                 <label
                                                     class="col-form-label"
-                                                    for="name"
+                                                    for="document_expedition_date"
                                                 >Doc. expedition date</label>
                                                 <input
                                                     type="text"
-                                                    name="doc_exp_date"
+                                                    name="document_expedition_date"
                                                     t-attf-class="form-control"
                                                     t-att-value="doc_exp_date or checkin_partner.document_expedition_date"
                                                 />
@@ -410,7 +428,7 @@
                                             <div t-attf-class="form-group col-xl-6">
                                                 <label
                                                     class="col-form-label"
-                                                    for="name"
+                                                    for="mobile"
                                                 >Mobile</label>
                                                 <input
                                                     type="text"
@@ -422,7 +440,7 @@
                                             <div t-attf-class="form-group col-xl-6">
                                                 <label
                                                     class="col-form-label"
-                                                    for="name"
+                                                    for="email"
                                                 >Email</label>
                                                 <input
                                                     type="text"
@@ -439,12 +457,15 @@
                     </t>
                     <tr>
                         <td>
-                            <button
-                                type="submit"
-                                class="btn btn-primary float-right mb32 "
-                            >
-                                Confirm<span class="fa fa-long-arrow-right" />
-                            </button>
+                            <div class="clearfix">
+                                <button
+                                    type="submit"
+                                    class="btn btn-primary float-right mb32 "
+                                >
+                                    Confirm
+                                    <span class="fa fa-long-arrow-right" />
+                                </button>
+                            </div>
                         </td>
                     </tr>
                 </tbody>