Refactor captcha forms

Change-Id: I532172be98e483222daaed765e2e596a3cad954b