Added fix for current passwords being <= 6 chars