replaced a couple of changes squashed by the last merge, fixed a bug in
login from login warning dialog
Merge pull request #4 from chrissbarnett/master

bugfix: login from login warning dialog.  replaced a line squashed in the last merge
Merge pull request #5 from TuftsOGP/master

bugfix: login from login warning dialog.  replaced a line squashed in the last merge