Refactor of Auth Admin - Completion