Elise: refactored the user authentication steps