Issue #2370877 by joachim: Fix reloading of wizard steps after first