Add security for join event #4
Merge useless