refactor of Login page is ready for +1