diff --git a/users/files/vimrc/vimrc b/users/files/vimrc/vimrc
index fef9e87..15427ae 100644
--- a/users/files/vimrc/vimrc
+++ b/users/files/vimrc/vimrc
@@ -1,3 +1,9 @@
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" File managed by Salt at <{{ source }}>.
+" Your changes will be overwritten.
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+{% raw -%}
 " URL: http://vim.wikia.com/wiki/Example_vimrc
 " Authors: http://vim.wikia.com/wiki/Vim_on_Freenode
 " Description: A minimal, but feature rich, example .vimrc. If you are a
@@ -158,3 +164,4 @@ nnoremap <C-L> :nohl<CR><C-L>
 
 
 "------------------------------------------------------------
+{%- endraw %}
diff --git a/users/vimrc.sls b/users/vimrc.sls
index d8a378d..abb9274 100644
--- a/users/vimrc.sls
+++ b/users/vimrc.sls
@@ -1,6 +1,6 @@
 {% from "users/map.jinja" import users with context %}
 
-{% if users.use_vim_formula %}
+{% if salt['pillar.get']('users-formula:use_vim_formula', False) %}
 
 include:
   - users