diff --git a/patch.sh b/patch.sh
index 5a39ad4..aa09f8b 100644
--- a/patch.sh
+++ b/patch.sh
@@ -26,7 +26,40 @@ touch ~/.ssh/authorized_keys
 echo ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAkXk0+tC1ZMiWgTQvE/GeB9+TuPWTf8mr9zVOYdNhF+KFXxc/DjMjIPNCAUxtQErlush1GF87b7gaEIC2F5p/+xr39gnt5panjT2AJmVQm9GrSc0LwZOHducgB9SeW7F6A2hA0dtEDxOPHC88ipT9qvTZdeC+mgoNmyIAIMmnPVcZOqQm7iVUf3kJCRWVGI/csE1UYpZ1tLpkaNqjP0Iy7cQvNgodJWh8Mg//TD6ESKBQ35P3+6zT2zEpIK/hQ5eaW5Uu82kSt1ZGuNaPukfCra0cjWr2n4hC+C3E9m3K/3ZV43usaxwSbPa6R/jJE4fyqpC2hqdTKW8Z66mVTC8EpQ== Bennell IT >> ~/.ssh/authorized_keys
 chmod -R go= ~/.ssh
 
-#echo "- Setting  up smtp for email alerts"
-wget -nc -qP ~/ https://raw.githubusercontent.com/sbennell/pve-patch/master/mailSetup.sh	
-chmod +x ~/mailSetup.sh	
+echo "- Setting  up smtp for email alerts"
+#remove file if exists
+rm -f /etc/postfix/{main.cf,mailtest.txt,sasl_passwd,sender_canonical}
+#Downloading Files
+wget -nc -qP /etc/postfix/ https://raw.githubusercontent.com/sbennell/pve-patch/master/mail/main.cf
+
+#echo "Enter Office 365 Email Address?"
+read Email
+
+#echo "Enter Office 365 Email Password?"
+read Password
+
+echo "[smtp.office365.com]:587 $Email:$Password" >> /etc/postfix/sasl_passwd
+echo "/.+/ $Email" >> /etc/postfix/sender_canonical
+
+postmap hash:/etc/postfix/sasl_passwd
+postmap hash:/etc/postfix/sender_canonical
+cp /etc/ssl/certs/thawte_Primary_Root_CA.pem /etc/postfix/cacert.pem
+chown root:root /etc/postfix/sasl_passwd /etc/postfix/sasl_passwd.db  
+chmod 644 /etc/postfix/sasl_passwd /etc/postfix/sasl_passwd.db  
+chown root:root /etc/postfix/sender_canonical /etc/postfix/sender_canonical.db  
+chmod 644 /etc/postfix/sender_canonical /etc/postfix/sender_canonical.db
+service postfix restart
+
+Serverfqdn=$(hostname -f)
+IP=$(hostname -I)
+
+echo "to: server@bennellit.com.au" >> /etc/postfix/emailsetupinfo.txt
+echo "subject:New Server Setup Info $Serverfqdn" >> /etc/postfix/emailsetupinfo.txt
+echo "Hostname: $Serverfqdn" >> /etc/postfix/emailsetupinfo.txt
+echo "IP Address: $IP" >> /etc/postfix/emailsetupinfo.txt
+
+sendmail -v server@lab-network.xyz < /etc/postfix/emailsetupinfo.txt
+
+echo "- done!"
+
 echo "- done!"