Added more login steps