Handle Captcha reload appropriately

Change-Id: Ie851063c24c0875ebd58661396377ce0fd4e422c