Fixes on the registration process.
Merge pull request #237 from leparc/customization

Fixes on the registration process.