Fix/do not forward to wrong user

Merged Erwan Croze requested to merge fix/do_not_forward_to_wrong_user into master

Merge request reports