Check when registrered user tries to join
Filter for links in error message
Merge remote-tracking branch 'origin/master'