Registration form enhancements Fixes #160