Remove captcha doubling

Remove captcha doubling so the new address/mailbox captcha work