diff --git a/web/src/admin.js b/web/src/admin.js
index f37401d187..08e7e10e02 100644
--- a/web/src/admin.js
+++ b/web/src/admin.js
@@ -3,6 +3,7 @@ import $ from "jquery";
 import render_admin_tab from "../templates/settings/admin_tab.hbs";
 import render_settings_organization_settings_tip from "../templates/settings/organization_settings_tip.hbs";
 
+import * as bot_data from "./bot_data";
 import {$t, get_language_name, language_list} from "./i18n";
 import {page_params} from "./page_params";
 import {realm_user_settings_defaults} from "./realm_user_settings_defaults";
@@ -201,6 +202,7 @@ export function build_page() {
         realm_enable_read_receipts: page_params.realm_enable_read_receipts,
         allow_sorting_deactivated_users_list_by_email:
             settings_users.allow_sorting_deactivated_users_list_by_email(),
+        has_bots: bot_data.get_all_bots_for_current_user().length > 0,
     };
 
     if (options.realm_logo_source !== "D" && options.realm_night_logo_source === "D") {
diff --git a/web/templates/settings/bot_list_admin.hbs b/web/templates/settings/bot_list_admin.hbs
index 4dab5591e4..46a07ccd0e 100644
--- a/web/templates/settings/bot_list_admin.hbs
+++ b/web/templates/settings/bot_list_admin.hbs
@@ -3,7 +3,19 @@
     </div>
     <div class="clear-float"></div>
     <div>
-        <button class="button rounded sea-green add-a-new-bot {{#unless can_create_new_bots}}hide{{/unless}}">{{t "Add a new bot" }}</button>
+        {{t "You are viewing all the bots in this organization." }}
+        {{#if can_create_new_bots}}
+            {{#tr}}
+                You can <z-link-new-bot>add a new bot</z-link-new-bot> or <z-link-manage-bot>manage</z-link-manage-bot> your own bots.
+                {{#*inline "z-link-new-bot"}}<a class="add-a-new-bot">{{> @partial-block}}</a>{{/inline}}
+                {{#*inline "z-link-manage-bot"}}<a href="/#settings/your-bots">{{> @partial-block}}</a>{{/inline}}
+            {{/tr}}
+        {{else if has_bots}}
+            {{#tr}}
+                You can <z-link>manage</z-link> your own bots.
+                {{#*inline "z-link"}}<a href="/#settings/your-bots">{{> @partial-block}}</a>{{/inline}}
+            {{/tr}}
+        {{/if}}
     </div>
     <div class="settings_panel_list_header">
         <h3>{{t "Bots"}}</h3>