Changed security message and moved to a single place