Registration Forms Review fixes