Citizen

Copy captcha and user type fixes from master