Added protection against sensitive fields
Merge remote-tracking branch 'upstream/user' into user
Fix register form