Registration workflow improvements and fixes