Fixed an issue with Registration