New user model added
Merge conflict
Merged Poo's changes (user form)