Then perhaps it should be said openly, that this is an elderly tax, not a pension and it should be just kept to the minimum, allowing people to save more of their own income for their own private pension.
Currently, it's the worst of both worlds: you get taxed quite a significant portion of your income, and then, in the middle of the game, someone changes the rules and tells you to play longer in order to get the prize.