Accounts Module user changes as with the other modules
Revert "Accounts Module user changes as with the other modules"

This reverts commit 372b9f493c1b8bb91f67ecb962c01acf8ea0ce6a.
Revert "Revert "Accounts Module user changes as with the other modules""

This reverts commit 91653beffd091e337cc120237c50e9bd93b3a799.