Better fix for security access
Merge pull request #2821 from fleure/secfix

Better fix for security access