PII fix and user registration fixes
Merged user.rb from Sam's code