Revert "Module: users *Update 2*"

This reverts commit 7fa9c7e6d18ee56c01d0f8a09b03c2ff2aa60fb7.
Revert "Revert "Module: users *Update 2*""

This reverts commit 5b0346b92177a01d8302d946fb769ccbeb9c065a.