Resolve "Improve session security"

Till Brehmrequested to merge
6179-improve-session-security into develop

Closes #6179 (closed)

Edited by Till Brehm

Merge request reports