Registration bugfix