Merged with gae-init/gae-init:
Fix show recaptcha for authorized users.
Merged with gae-init/gae-init:
Minor fixes.