some fixes for contact selfservice login and password reset, #25533