Fixed for supporting the new password system (if you already have the new password)