diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 3037a23d..26e9e14a 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -388,10 +388,15 @@ STATUS(){
 							if [ "${freespace}" -le "1000" ]; then
 								fs_status='error'
 								fs_status_color='Red'
+								if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${partition} : ${freespace} MB free" | mail -s "Free Space Critical: '${NM_NODETYPES[$NTYPE]}-Node${nid}'" ${STATUS_CHECK_EMAIL}; fi
+
 							elif [ "${freespace}" -le "10000" ]; then
 								fs_status='warn'
 								fs_status_color='Yellow'
+								if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${partition} : ${freespace} MB free" | mail -s "Free Space Warning: '${NM_NODETYPES[$NTYPE]}-Node${nid}'" ${STATUS_CHECK_EMAIL}; fi
+								
 							else
+								fs_status=''
 								fs_status_color='Green'
 								
 							fi