Password fix for merge

Let me know if I'm still doing it wrong, @almathew