NR-610 : Complete the security gateway

Small changes.
NR-610 : Complete the security gateway

Added authentificated gateways.