Some more modifications, committing before admin login system change