[ticket/12404] Adds two new events and changes some places

PHPBB3-12404