UserSelfService: small fixes