Fixed issues with insecure config option being ignored
Merge pull request #209 from andrewfenn/develop

Fixed issues with insecure config option being ignored