Fix default expiry date to be the 25th

Done through the GitHub UI as I wanted to get this in quick
Merge branch 'voting-button-fix' into production