#2498: login page changes
Merge remote-tracking branch 'origin/release'
Fixes #2499 #2500 master
Merge pull request #2502 from Lineflyer/master

Fixes #2499 #2500 on master branch as well
Merge remote-tracking branch 'upstream/master' into Fix-2214