Password related bugfixes