fix logic snafu causing sure-to-fail logins
Merge remote-tracking branch 'origin/master'