diff --git a/admin_settings_mail.php b/admin_settings_mail.php
index 455bb047..48814e69 100644
--- a/admin_settings_mail.php
+++ b/admin_settings_mail.php
@@ -295,7 +295,7 @@ require_once "includes/inc_all_admin.php";
                         <option value="4"><?php echo nullable_htmlentities($config_ticket_from_name); ?> (<?php echo nullable_htmlentities($config_ticket_from_email); ?>)</option>
                         <?php } ?>
 
-                        
+
                     </select>
                     <input type="email" class="form-control " name="email_to" placeholder="Email address to send to">
                     <div class="input-group-append">
@@ -319,7 +319,7 @@ require_once "includes/inc_all_admin.php";
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
                 <div class="input-group-append">
-                    <button type="submit" name="test_email_imap" class="btn btn-success"><i class="fas fa-fw fa-inbox mr-2"></i>Test</button>
+                    <button type="submit" name="test_email_imap" class="btn btn-success" disabled><i class="fas fa-fw fa-inbox mr-2"></i>Test (WIP)</button>
                 </div>
             </form>
         </div>
diff --git a/post/admin/admin_settings_mail.php b/post/admin/admin_settings_mail.php
index d3e18010..9178e832 100644
--- a/post/admin/admin_settings_mail.php
+++ b/post/admin/admin_settings_mail.php
@@ -108,7 +108,7 @@ if (isset($_POST['test_email_smtp'])) {
     $mail = addToMailQueue($data);
 
     if ($mail === true) {
-        $_SESSION['alert_message'] = "Test email queued successfully! <a class='text-bold text-light' href='admin_mail_queue.php'>Check Admin > Mail queue</a>";
+        $_SESSION['alert_message'] = "Test email queued! <a class='text-bold text-light' href='admin_mail_queue.php'>Check Admin > Mail queue</a>";
     } else {
         $_SESSION['alert_type'] = "error";
         $_SESSION['alert_message'] = "Failed to add test mail to queue";