Fix bug 1106197 - Fix for displaying error/help dialogs
Merge pull request #458 from jbuck/login3-pt2

Fix bug 1106197 - Fix for displaying error/help dialogs