Pulled in login.php and the associated changes from 1.6 to fix issue #19
Pulled in login.php and the associated changes from 1.6 to fix issue #19