Merge branch 'havfar/fix/users'

2 jobs for master in 3 minutes and 2 seconds