Had some bugs in the admin login setup

* Refactored a lot of the process
* Added in object name, since if not logged in that's not set in the
master file