Revert c118df9..a96e651

This rolls back to commit c118df99d9e9e6f90f5d07c798b3198f7768baf9.
Revert a578ad8..b876cdd

This rolls back to commit a578ad8ab908a4d5e72bf0950919e8110ecfc8c3.
Adding Users