I'm attaching a new patch that attempts to fix this issue (mojca who forgot her password).