Waiting for #5907 to be solved on a bigger scale, we should fix the problem at least for password recovery where it was seen