Fix #87: security helper converted into component and improved

Fix #87: security helper improvement

Migrated from #4052
I suppose we can keep orignal fallback.