Fixed certificate recovery & check