I think we should just use the original window as we did before with the CompleteRegistration page.