Wording changes
Refactored User & Register