login page fixed
Merge branch 'issue-194' into develop