make users independent
Merge pull request #1348 from marcel-blonk/release-45

make users independent