Fix passwd

@tsantef This worked for me, but please test.