Change implementation of current_contract

[tbjoern]

Is current contract important? The way it is implemented now checks if the contract end date is after the current date. This can cause usability issues.