FORUM-848 | Improve performance when open from UserSelector - Update code after review.