Refactoring out 'login' references