edits to User Class
Merge commit 'f498834'