Fixes: #2340 Inserting default configuration values