Added support for Captcha

Change-Id: I2578b83f120320d9ceef9233e451caf0dca1a411