diff --git a/frontend/module/system/css/installsmtp.css b/frontend/module/system/css/installsmtp.css
new file mode 100644
index 00000000..dde26ea9
--- /dev/null
+++ b/frontend/module/system/css/installsmtp.css
@@ -0,0 +1 @@
+#mainContent .main-col {display: block;}
diff --git a/frontend/module/system/js/installsmtp.js b/frontend/module/system/js/installsmtp.js
index 664f09ff..a18e7433 100644
--- a/frontend/module/system/js/installsmtp.js
+++ b/frontend/module/system/js/installsmtp.js
@@ -11,6 +11,17 @@ $(function()
         var enableSMTP   = $('#smtpForm input[type=checkbox]:checked').length > 0;
         var accountRight = $('#verifyAccountBtn').attr('pass') == 'true';
 
+        if(enableSMTP)
+        {
+          $('#smtpForm').find('table').show();
+          $('#smtpForm').find('button[type=submit]').show();
+        }
+        else
+        {
+          $('#smtpForm').find('table').hide();
+          $('#smtpForm').find('button[type=submit]').hide();
+        }
+
         if(enableSMTP && accountRight)
         {
           $('#smtpForm button[type=submit]').attr('disabled', false);
@@ -28,6 +39,13 @@ $(function()
 
     $('#smtpForm input[type=checkbox]').change();
 
+    $('#smtpForm input[type=text]').on('change', function(event)
+    {
+        $('#verifyAccountBtn').attr('pass', 'false');
+        $('#verifyResult').text('');
+        freshSubmitBtn();
+    });
+
     $('#verifyAccountBtn').on('click', function(event)
     {
         var settings = {};