diff --git a/app/routes/events/view/edit/attendee.js b/app/routes/events/view/edit/attendee.js
index 9cbec78690c..48d55a6d4e0 100644
--- a/app/routes/events/view/edit/attendee.js
+++ b/app/routes/events/view/edit/attendee.js
@@ -23,7 +23,7 @@ export default class AttendeeRoute extends Route.extend(CustomFormMixin) {
       customForms : (await event.query('customForms', {
         filter       : filterOptions,
         sort         : 'id',
-        'page[size]' : 50
+        'page[size]' : 500
       })).toArray().filter(field => field.form === 'attendee')
     };
     return data;
diff --git a/app/routes/orders/pending.js b/app/routes/orders/pending.js
index ee25129110e..4ebbf83145c 100644
--- a/app/routes/orders/pending.js
+++ b/app/routes/orders/pending.js
@@ -21,11 +21,32 @@ export default class PendingRoute extends Route {
       reload  : true
     });
     const eventDetails = await order.query('event', { include: 'tax' });
+    const tickets     = await order.query('tickets', {});
+    const filterOptions = [
+      {
+        or: []
+      }
+    ];
+    tickets.forEach(ticket => {
+      filterOptions[0].or.pushObject({
+        name : 'form_id',
+        op   : 'eq',
+        val  : ticket.formID
+      });
+    });
+
+    filterOptions[0].or.pushObject({
+      name : 'is_required',
+      op   : 'eq',
+      val  : true
+    });
+
     return {
       order,
       event : eventDetails,
       form  : await eventDetails.query('customForms', {
-        'page[size]' : 70,
+        filter       : filterOptions,
+        'page[size]' : 700,
         sort         : 'id'
       })
     };