Upgrade key when not succesfully used and strict high validation level

XXX: it's missing tests