diff --git a/modules/imap/modules.php b/modules/imap/modules.php
index 4579e1ad5d..8195b746d3 100644
--- a/modules/imap/modules.php
+++ b/modules/imap/modules.php
@@ -1701,12 +1701,12 @@ protected function output() {
                 '" type="password" name="imap_pass"></span>';
 
             if (!$no_edit) {
-                $res .= '<input type="submit" value="'.$this->trans('Test').'" class="test_imap_connect" />';
                 if (!isset($vals['user']) || !$vals['user']) {
                     $res .= '<input type="submit" value="'.$this->trans('Delete').'" class="imap_delete" />';
                     $res .= '<input type="submit" value="'.$this->trans('Save').'" class="save_imap_connection" />';
                 }
                 else {
+                    $res .= '<input type="submit" value="'.$this->trans('Test').'" class="test_imap_connect" />';
                     $res .= '<input type="submit" value="'.$this->trans('Delete').'" class="imap_delete" />';
                     $res .= '<input type="submit" value="'.$this->trans('Forget').'" class="forget_imap_connection" />';
                 }
diff --git a/modules/pop3/modules.php b/modules/pop3/modules.php
index fffb046813..1a6d0f1d30 100644
--- a/modules/pop3/modules.php
+++ b/modules/pop3/modules.php
@@ -783,12 +783,12 @@ protected function output() {
                 '<span> <label class="screen_reader" for="pop3_password_'.$index.'">'.$this->trans('POP3 password').'</label>'.
                 '<input '.$disabled.' id="pop3_password_'.$index.'" class="credentials pop3_password" placeholder="'.$pass_pc.'" type="password" name="pop3_pass"></span>';
             if (!$no_edit) {
-                $res .= '<input type="submit" value="Test" class="test_pop3_connect" />';
                 if (!isset($vals['user']) || !$vals['user']) {
                     $res .= '<input type="submit" value="'.$this->trans('Delete').'" class="delete_pop3_connection" />';
                     $res .= '<input type="submit" value="'.$this->trans('Save').'" class="save_pop3_connection" />';
                 }
                 else {
+                    $res .= '<input type="submit" value="Test" class="test_pop3_connect" />';
                     $res .= '<input type="submit" value="'.$this->trans('Delete').'" class="delete_pop3_connection" />';
                     $res .= '<input type="submit" value="'.$this->trans('Forget').'" class="forget_pop3_connection" />';
                 }
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index aa2a5f066b..39383693fa 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -824,12 +824,12 @@ protected function output() {
                 $pass_pc.'" type="password" id="smtp_pass_'.$index.'" name="smtp_pass"></span>';
 
             if (!$no_edit) {
-                $res .= '<input type="submit" value="'.$this->trans('Test').'" class="test_smtp_connect" />';
                 if (!isset($vals['user']) || !$vals['user']) {
                     $res .= '<input type="submit" value="'.$this->trans('Delete').'" class="delete_smtp_connection" />';
                     $res .= '<input type="submit" value="'.$this->trans('Save').'" class="save_smtp_connection" />';
                 }
                 else {
+                    $res .= '<input type="submit" value="'.$this->trans('Test').'" class="test_smtp_connect" />';
                     $res .= '<input type="submit" value="'.$this->trans('Delete').'" class="delete_smtp_connection" />';
                     $res .= '<input type="submit" value="'.$this->trans('Forget').'" class="forget_smtp_connection" />';
                 }