Made additional changes for using the login object