Who is online fixes
issue-567 and prevent XSS