Check in Form - Collecting guest data for X number of guests

We just recently migrated to Hostaway and we are running into an issue when collecting guest data. We ask the guests to provide the names of all adult guests that will be staying on the property and in our rental agreement we state that only those guests listed are allowed on the property without prior permission from us.

So we set up the Check in Form to collect the names of each guest. Apparently, the check in form is using the "number of guests" field, to determine the number of guests and provides only that number of entries for guest names.

The problem we are running in to, and it happens quite frequently, is that guests typically don't set their guest count on the OTAs, which means the guest count defaults to 1. When this happens, the check in form only prompts for information for 1 guest. 

I think what would be better is to have as many guest name field prompts as the maximum occupancy of the property. This way if the guest doesn't set their count correctly, which again, happens a lot, they will still have room to enter all of the guest names, instead of being prompted for only 1.