Recent changes for login implementation