Fixed XML and registration form