Multiple Logon Pages (APM) Reset Customisation

Let me try and describe the workflow a bit better.

We present the user with a logon page asking for username and password and RAS token. If the user doesn't have a RAS token, we have the workflow proceed down a SMS based OTP macro to use an SMS code to perform dual factor authentication. In order for this OTP to work another logon page object is used in the workflow as part of a macro. When this macro is called in the workflow, the logon page is presented but it is customised to (1) show a single field only (which is used for the OTP code) and (2) has the button modified to resend the SMS if it didn't get there in time (effectively does a loop of the macro for 3 times). Due to the OTP logon page being customised during the macro, the values of the form stay as they are. Subsequently when putting in an AD query into the workflow that happens after the OTP macro, the AD query shows the custom logon page from the OTP macro rather than what would normally appear for an AD query. In order for the AD query to work properly another default logon page needs to be added before the AD query to reset the forms variables. The problem with doing this is that the user is then presented with a Logon button to continue (which we don't want).