Merge branch 'feature/balga/userFix' into 'main'

self editing not allowed

See merge request !49
2 jobs for main
in 2 minutes and 3 seconds and was queued for 5 seconds