Finalizing Captcha Registry'fy

Captcha registry take 3 post review.