Fix verify and registration.