Basic user entity updates, with new abstracted forms for user admin
Resolved Merge conflicts