Updated the model and fixed the register pages.
Merge.