Fixed bug 2031 and other login page issues.