diff --git a/src/def.go b/src/def.go
index 992fd8c..23d2ae4 100644
--- a/src/def.go
+++ b/src/def.go
@@ -42,7 +42,7 @@ import (
 const (
 	/* Build Constants */
 	SYSTEM_NAME       = "Zoraxy"
-	SYSTEM_VERSION    = "3.1.7"
+	SYSTEM_VERSION    = "3.1.8"
 	DEVELOPMENT_BUILD = false /* Development: Set to false to use embedded web fs */
 
 	/* System Constants */
diff --git a/src/web/components/utils.html b/src/web/components/utils.html
index 524ec35..44ed625 100644
--- a/src/web/components/utils.html
+++ b/src/web/components/utils.html
@@ -259,6 +259,8 @@
 
     /*
         SMTP Settings
+
+        TODO: Remove SMTP support in future versions
     */
     
     //Bind events to the form
@@ -273,11 +275,13 @@
             adminAddr: $('input[name=recvAddr]').val()
         };
 
+        /*
         var inputValid = validateSMTPInputs();
         if (!inputValid){
             msgbox("SMTP input not valid", false, 5000);
             return;
         }
+        */
 
         $.cjax({
             type: "POST",