Fixes Issue #569
Merge pull request #582 from ndomar/bugfix_#569

Bug: link from invitation gives a 500