Fixed login
login is broken again
Merge remote-tracking branch 'upstream/master' into jp361
login is still broken
Merge pull request #431 from jaypoulz/jp361

Stuff is broken but Mike will fix it