Simplification of callback passing
Password verification enhanced