Edit Registration Enhancement