Merge pull request #4638 from fblaese/pwlogin