Merge branch '5481-spf-button-admin' into 'develop'

Resolve "SPF modification error with user account"

Closes #5481

See merge request !1612
1 job for develop in 8 seconds (queued for 3 seconds)