added new login and addressed nishant comments