zap preview and user names
Merge pull request #1432 from RickSaling/join

zap preview and user names