DP-334 Removed isSecurityEnabled check