User Registration related changes final