Fix remaining type errors after addition of login handler.

Created by  Kris Nuttycombe  on January 20, 2015
VJPT6HDRMJAJD5PT3VOYJYW43ISKLICEHLSDWSROX2XZWO2OFZPQC
Change contents