More changes for login authentication code