Security for enricher and navbar substituted