Settings: backport certain fixes from v1-r

Description

This MR resolves the linked issue

Issue(s)

• https://gitlab.e.foundation/e/backlog/-/issues/5124

Test environment

• Build Settings with this MR

Test procedures

• Ensure linked issue is resolved

Technical details

• None available

Screenshots

• None available

Check list

• Self-review
• Test procedure explained
• Tested applied as an update