Bugfix/6694 user visibility