Modified some methods like admin login, user login