Fixing Issue_474 : The original fix was applied just to the main login page and the change was not applied here. Therefore I'm duplicating it.
Merge pull request #95 from michaelhidalgo/Issue_474

Issue 474