We have a custom branded community set up, this includes branding all 'native' functions such as password reset as well. We accomplished this by enabling Chatter Answers and customizing the Change Password page this way. This works in a regular flow (call Site.ForgotPassword(), user receives email with link, link leads to branded page and user can reset his password)

The problem is that after he has reset his password, clicking the link again redirects to a standard Salesforce login page with a message saying login has failed (but which works to log in to the portal with the new password). 

My question is: Can I change this page or fix the failed auto-login issue somehow?