Allow new-reset-password to take a uri-context