diff --git a/companies.php b/companies.php
index ee6b370f..f6bb7d5e 100644
--- a/companies.php
+++ b/companies.php
@@ -26,6 +26,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
     </div>
   </div>
   <div class="card-body">
+    <div class="alert alert-danger" role="alert">
+      <b>The multi-company feature should be considered deprecated.</b> It may be removed in the near future - please see the <a href="https://forum.itflow.org/d/74-removing-the-multi-company-feature">forum post</a>.
+    </div>
+    <hr>
     <form autocomplete="off">
       <div class="input-group">
         <input type="search" class="form-control col-md-4" name="q" value="<?php if(isset($q)){ echo stripslashes(htmlentities($q)); } ?>" placeholder="Search Companies">
diff --git a/post.php b/post.php
index 1cc3f48a..da33df9d 100644
--- a/post.php
+++ b/post.php
@@ -25,7 +25,8 @@ if(isset($_GET['switch_company'])){
         
         mysqli_query($mysqli,"UPDATE user_settings SET user_default_company = $company_id WHERE user_id = $session_user_id");
 
-        $_SESSION['alert_message'] = "Switched Companies!";
+        $_SESSION['alert_type'] = "error";
+        $_SESSION['alert_message'] = "Switched Companies. <a href='https://forum.itflow.org/d/74-removing-the-multi-company-feature' target='_blank'>Deprecated!</a>";
 
         //Logging
         mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Company', log_action = 'Switch', log_description = '$session_name switched to company $company_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent',  log_user_id = $session_user_id, company_id = $session_company_id");