Bug fixes during certificate exchange for inter-PZH user accounts

Jira issue: WP-959