@bousquet the `password.present? || password_confirmation.present?` doesn't really make sense here, at least not for determining if the password should be required. I have a feeling you're compensating for the confirmation conditional logic since it also relies on this `password_required?` method. 

I think it would be more appropriate to revert this method and add a `password_confirmation_required?` method, which would essentially be this logic, to ensure that the confirmation is validated when a value is provided, regardless of whether the password is required to be changed by the system.