improve registration with return_to