Merge branch '5390-master-e_account_settings' into 'master'

5390 master e account settings

See merge request !43
2 jobs for master in 7 minutes and 33 seconds (queued for 2 seconds)