Merge branch 'fix_ui_registration_templates' into 'master'

Fix ui registration templates

Closes #490 and #491

See merge request !257
1 job for master in 26 minutes and 29 seconds (queued for 6 seconds)