fix Bug #625758 regarding --disabled-(login|password)
this simply belongs into this upload and fixes a long standing bug that we have been discussing to hell and back. It includes some drive-by fixes that came up during final bug triage.
Sorry for the initially wrong title.
Please give it a quick review, in my opinion it is ready to merge if tests pass.
Edited by Marc Haber