diff --git a/etc-git/files/etc-git-status.sh b/etc-git/files/etc-git-status.sh
new file mode 100644
index 00000000..1b78f138
--- /dev/null
+++ b/etc-git/files/etc-git-status.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+set -e
+export TERM=screen
+export LC_ALL=C
+
+hostname=$(grep HOSTNAME /etc/evomaintenance.cf | cut -d'=' -f2)
+hostname=${hostname%%.evolix.net}
+template=$(mktemp --tmpdir=/tmp etc-git-status.XXX)
+body=$(mktemp --tmpdir=/tmp etc-git-status.XXX)
+lastLogOutput=$(mktemp --tmpdir=/tmp etc-git-status.XXX)
+gitOutput=$(mktemp --tmpdir=/tmp etc-git-status.XXX)
+lastTime=7
+uidRange="2000-2099"
+
+# Remove temporary files on exit
+trap "rm $lastLogOutput $template $body $gitOutput" EXIT
+
+# Get last admins connected
+lastlog -t $lastTime -u $uidRange > $lastLogOutput
+
+# Add these admins to lastAdmins variable if any
+lastLogOutputCount=$(wc -l $lastLogOutput | awk '{ print $1 }')
+if [ $lastLogOutputCount -gt 1 ]; then
+    while read line; do
+        user=$(awk '{ print $1 }' <<< $line)
+        if [ $user != "Username" ]; then
+            lastAdmins="$lastAdmins${user}@evolix.fr, "
+        fi
+    done < $lastLogOutput
+else
+    # No admin connected in the last 7 days, send to root
+    lastAdmins="root"
+fi
+
+# Send the mail if git status not empty
+git --git-dir=/etc/.git --work-tree=/etc status --short > $gitOutput
+gitOutputNumber=$(wc -l $gitOutput | awk '{ print $1 }')
+if [ $gitOutputNumber -gt 0 ]; then
+    cat << EOT > $template
+Content-Type: text/plain; charset="utf-8"
+Reply-To: Équipe Evolix <equipe@evolix.fr>
+From: Équipe Evolix <equipe@evolix.net>
+To: $lastAdmins
+Subject: Non commited /etc for server $hostname
+EOT
+    cat << EOT > $body
+Dear ${lastAdmins}
+
+As you were connected on $hostname in the last 7 days, please commit modifications on /etc.
+You should use evomaintenance for that.
+
+git status:
+
+$(<$gitOutput)
+
+--
+etc-git-status.sh
+EOT
+    mutt -x -e 'set send_charset="utf-8"' -H $template < $body
+fi
diff --git a/etc-git/templates/etc-git-status.j2 b/etc-git/templates/etc-git-status.j2
index e1696c54..ee6d9a74 100644
--- a/etc-git/templates/etc-git-status.j2
+++ b/etc-git/templates/etc-git-status.j2
@@ -1,4 +1,4 @@
 # {{ ansible_managed }}
 
-@hourly root who > /dev/null || git --git-dir=/etc/.git --work-tree=/etc status --short
-21 21 * * * root git --git-dir=/etc/.git --work-tree=/etc status --short
+@hourly root who > /dev/null || /usr/share/scripts/etc-git-status.sh
+21 21 * * * root /usr/share/scripts/etc-git-status.sh