[ticket/12680] Little changes, but some issues are still there

PHPBB3-12680