Fixing a bug having todo with passwords