More work on registration validation