fix disable password issues
Merge branch 'two-point-oh' of github.com:clef/wordpress into two-point-oh