Fixed password option

Previous idea was bugged so this is the fix.

woohoo for git... not really but here is the second commit.