Updated to match changes in SFDC login page over last year.