Fix #87: security helper converted into component and improved

Fix #87: security helper improvement

Migrated from #4052
I expect that's a bug and once we fix it we can use that algorithm.