Revert "removed changes in Admin Module (reverse-merged from commit 0ec69ac6595616e0b404b96a5d83bf9225faa620)"

This reverts commit f46644b8110c1b0b483a108be32849961f7e4d16.