Switched various files to new Login service.