DS-438 #done Globally hide/display opt-in fields
DS-438 Refactor register form display to simplify
Fix indentation per #3121 comments
Merge pull request #3121 from aaronschachter/opt-in

Fixes bug in User Profile form