Fix Failed Security Check Notice 

Should resolve issue Issue #821, but recommend lots of testing as changes are in areas of vital functionality.