[ticket/10737] Improvements over last commit

PHPBB3-10737