Do not expire already disabled users, it fixes #3644