Finish up the work in regards to security notifications