missing earlier commit (which however does not appear to solve the problem of empty passwords)