diff --git a/zsh/.config/zsh/.zprofile b/zsh/.config/zsh/.zprofile
index eedba38..6bfcdf7 100755
--- a/zsh/.config/zsh/.zprofile
+++ b/zsh/.config/zsh/.zprofile
@@ -1,9 +1 @@
 emulate sh -c 'source /etc/profile'
-
-# Notify on ssh login
-IP="$(echo $SSH_CONNECTION | cut -d " " -f 1)"
-HOSTNAME=$(hostname)
-NOW=$(date +"%e %b %Y, %a %r")
-EMAIL='erictorres4@protonmail.com'
-
-echo "Login from ${IP} on ${HOSTNAME} on ${NOW}" | neomutt -s 'SSH Login Notification' "${EMAIL}" 2>/dev/null
diff --git a/zsh/.config/zsh/conf.d/ssh-login.zsh b/zsh/.config/zsh/conf.d/ssh-login.zsh
new file mode 100644
index 0000000..29f549f
--- /dev/null
+++ b/zsh/.config/zsh/conf.d/ssh-login.zsh
@@ -0,0 +1,8 @@
+# Notify on ssh login
+if [[ -n $SSH_CONNECTION ]]; then
+    IP="$(echo $SSH_CONNECTION | cut -d " " -f 1)"
+    HOSTNAME=$(hostname)
+    NOW=$(date +"%e %b %Y, %a %r")
+    EMAIL='erictorres4@pm.me'
+    echo "Login from ${IP} on ${HOSTNAME} on ${NOW}" | neomutt -s 'SSH Login Notification' "${EMAIL}" 2>/dev/null
+fi