2 new login page
2 login pages
Merge branch 'issue-187' into develop