make users independent
Merge pull request #1346 from marcel-blonk/PLFM-1174

make users independent