Merge pull request #1666 from onepercentclub/feature/admin-improvements

Feature/admin improvements
Change how func tests do logins + other minor tweaks