Refactoring on admin login
Merge conflicts fixed