Issue 3233: Adding rudimentary security checking - by passing via the headers