When AUP integration is enabled link avatar for guests are incorrect
Merge pull request #1946 from xillibit/k30_bugs16

When AUP integration is enabled link avatar for guests are incorrect