diff --git a/backend/canisters/local_user_index/CHANGELOG.md b/backend/canisters/local_user_index/CHANGELOG.md
index 58608c038d..8b331350ca 100644
--- a/backend/canisters/local_user_index/CHANGELOG.md
+++ b/backend/canisters/local_user_index/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 
 - Change bot cmd number param values from u16 to f64 ([#7095](https://github.com/open-chat-labs/open-chat/pull/7095))
+- Rename access token `parameters` to `command_args` ([#7104](https://github.com/open-chat-labs/open-chat/pull/7104))
 
 ## [[2.0.1530](https://github.com/open-chat-labs/open-chat/releases/tag/v2.0.1530-local_user_index)] - 2024-12-19
 
diff --git a/backend/canisters/local_user_index/impl/src/queries/access_token.rs b/backend/canisters/local_user_index/impl/src/queries/access_token.rs
index 375e22868a..d29beef814 100644
--- a/backend/canisters/local_user_index/impl/src/queries/access_token.rs
+++ b/backend/canisters/local_user_index/impl/src/queries/access_token.rs
@@ -70,8 +70,7 @@ async fn access_token(args: Args) -> Response {
                 thread_root_message_index: bc.thread_root_message_index,
                 message_id: bc.message_id,
                 command_name: bc.command_name,
-                parameters: bc.parameters,
-                version: bc.version,
+                command_args: bc.command_args,
                 command_text: bc.command_text,
                 bot_api_gateway: state.env.canister_id(),
             };
diff --git a/backend/canisters/local_user_index/impl/src/updates/execute_bot_command.rs b/backend/canisters/local_user_index/impl/src/updates/execute_bot_command.rs
index 72ca07959f..739601b984 100644
--- a/backend/canisters/local_user_index/impl/src/updates/execute_bot_command.rs
+++ b/backend/canisters/local_user_index/impl/src/updates/execute_bot_command.rs
@@ -31,6 +31,10 @@ fn validate(args: Args, state: &RuntimeState) -> Result<c2c_handle_bot_action::A
     let claims = verify_jwt::<Claims<BotCommandClaims>>(&args.jwt, state.data.oc_key_pair.public_key_pem())
         .map_err(|error| format!("Access token invalid: {error:?}"))?;
 
+    if claims.exp() < state.env.now() {
+        return Err("Access token expired".to_string());
+    }
+
     let bot_command_claims = claims.custom();
     let calling_user = bot.user_id;
     let jwt_user = bot_command_claims.bot;
diff --git a/backend/canisters/user_index/api/src/main.rs b/backend/canisters/user_index/api/src/main.rs
index 2dc4afe948..4aad21f067 100644
--- a/backend/canisters/user_index/api/src/main.rs
+++ b/backend/canisters/user_index/api/src/main.rs
@@ -64,5 +64,6 @@ fn main() {
     generate_ts_method!(user_index, submit_proof_of_unique_personhood);
     generate_ts_method!(user_index, suspend_user);
     generate_ts_method!(user_index, unsuspend_user);
+    generate_ts_method!(user_index, update_bot);
     generate_ts_method!(user_index, update_diamond_membership_subscription);
 }
diff --git a/backend/integration_tests/src/bot_tests.rs b/backend/integration_tests/src/bot_tests.rs
index 219cbbf93a..4495b8704b 100644
--- a/backend/integration_tests/src/bot_tests.rs
+++ b/backend/integration_tests/src/bot_tests.rs
@@ -93,8 +93,7 @@ fn e2e_bot_test() {
             thread_root_message_index: None,
             message_id,
             command_name: command_name.clone(),
-            parameters: "".to_string(),
-            version: 1, // TODO: Remove this
+            command_args: "".to_string(),
             command_text: command_name.clone(),
         }),
         chat,
diff --git a/backend/libraries/types/src/access_tokens.rs b/backend/libraries/types/src/access_tokens.rs
index ecd73c4189..df153ad078 100644
--- a/backend/libraries/types/src/access_tokens.rs
+++ b/backend/libraries/types/src/access_tokens.rs
@@ -38,8 +38,7 @@ pub struct BotCommandArgs {
     pub thread_root_message_index: Option<MessageIndex>,
     pub message_id: MessageId,
     pub command_name: String,
-    pub parameters: String,
-    pub version: u32,
+    pub command_args: String,
     pub command_text: String,
 }
 
diff --git a/backend/libraries/types/src/claims.rs b/backend/libraries/types/src/claims.rs
index abe5279a77..98050d040e 100644
--- a/backend/libraries/types/src/claims.rs
+++ b/backend/libraries/types/src/claims.rs
@@ -40,8 +40,7 @@ pub struct BotCommandClaims {
     pub thread_root_message_index: Option<MessageIndex>,
     pub message_id: MessageId,
     pub command_name: String,
-    pub parameters: String,
-    pub version: u32,
+    pub command_args: String,
     pub command_text: String,
     pub bot_api_gateway: CanisterId,
 }
diff --git a/frontend/app/src/components/Input.svelte b/frontend/app/src/components/Input.svelte
index dfdcba3ba9..80e7c3546b 100644
--- a/frontend/app/src/components/Input.svelte
+++ b/frontend/app/src/components/Input.svelte
@@ -15,6 +15,8 @@
         children?: Snippet;
         onblur?: () => void;
         onfocus?: () => void;
+        oninput?: () => void;
+        onenter?: () => void;
     }
 </script>
 
@@ -40,6 +42,8 @@
         pattern = undefined,
         onblur = undefined,
         onfocus = undefined,
+        oninput = undefined,
+        onenter = undefined,
         children,
     }: InputProps = $props();
 
@@ -61,6 +65,7 @@
             value = parseInt(e.currentTarget.value, 10);
         }
         dispatch("change", value);
+        oninput?.();
     };
 
     export function setValue(text: string) {
@@ -70,6 +75,7 @@
     function keyDown(e: KeyboardEvent) {
         if (e.key === "Enter") {
             dispatch("enter");
+            onenter?.();
         }
     }
 
diff --git a/frontend/app/src/components/bots/AutoBotBuilder.svelte b/frontend/app/src/components/bots/AutoBotBuilder.svelte
index 784cc6c24f..69ab28b304 100644
--- a/frontend/app/src/components/bots/AutoBotBuilder.svelte
+++ b/frontend/app/src/components/bots/AutoBotBuilder.svelte
@@ -2,13 +2,13 @@
     import Reload from "svelte-material-icons/Reload.svelte";
     import {
         validEndpoint,
-        emptyBotInstance,
         OpenChat,
         validateBot,
         ValidationErrors,
         type ExternalBot,
         type SlashCommandSchema,
         type ValidationErrorMessages,
+        userStore,
     } from "openchat-client";
     import { i18nKey } from "../../i18n/i18n";
     import Input from "../Input.svelte";
@@ -23,19 +23,21 @@
     import HoverIcon from "../HoverIcon.svelte";
     import { iconSize } from "../../stores/iconSize";
     import CommandViewer from "./CommandViewer.svelte";
+    import SingleUserSelector from "../home/SingleUserSelector.svelte";
 
     const client = getContext<OpenChat>("client");
 
     interface Props {
         valid: boolean;
         onUpdate: (bot: ExternalBot) => void;
+        candidate: ExternalBot;
+        nameDirty: boolean;
     }
 
-    let { valid = $bindable(), onUpdate }: Props = $props();
+    let { valid = $bindable(), onUpdate, candidate, nameDirty }: Props = $props();
     let selectedCommand = $state<SlashCommandSchema | undefined>(undefined);
     let selectedCommandIndex = $state<number | undefined>(undefined);
     let debug = $state(false);
-    let candidate = $state<ExternalBot>(emptyBotInstance());
     let schemaLoaded = $state(false);
     let schemaLoading = $state(false);
     let showNext = $derived(
@@ -49,7 +51,7 @@
             () => [$state.snapshot(candidate)],
             async () => {
                 const errors = validateBot(candidate);
-                if (errors.get("bot_name").length == 0) {
+                if (errors.get("bot_name").length == 0 && nameDirty) {
                     errors.addErrors("bot_name", await checkUsername(candidate.name));
                 }
                 return errors;
@@ -100,7 +102,7 @@
     // let editing = $derived(bot !== undefined);
 
     $effect(() => {
-        const isValid = errors.size === 0;
+        const isValid = errors.size === 0 && schemaLoaded;
         if (isValid !== valid) {
             valid = isValid;
         }
@@ -123,6 +125,15 @@
         selectedCommandIndex = index;
     }
 
+    function endpointChanged() {
+        schemaLoaded = false;
+        candidate.definition = {
+            kind: "bot_definition",
+            description: "",
+            commands: [],
+        };
+    }
+
     function loadDefinition() {
         if (!schemaLoading && validEndpoint(candidate.endpoint)) {
             schemaLoading = true;
@@ -173,6 +184,22 @@
         bind:value={candidate.id}>
     </ValidatingInput>
 
+    <Legend
+        required
+        label={i18nKey("bots.builder.ownerLabel")}
+        rules={i18nKey("bots.builder.ownerRules")}></Legend>
+    <SingleUserSelector
+        invalid={errors.has("bot_owner")}
+        error={errors.get("bot_owner")}
+        border={false}
+        direction={"up"}
+        mentionSelf
+        on:userSelected={(ev) => (candidate.ownerId = ev.detail.userId)}
+        on:userRemoved={(_) => (candidate.ownerId = "")}
+        selectedReceiver={$userStore.get(candidate.ownerId)}
+        placeholder={"bots.builder.ownerLabel"}
+        autofocus={false} />
+
     <Legend
         required
         label={i18nKey("bots.builder.nameLabel")}
@@ -197,13 +224,17 @@
                 maxlength={200}
                 invalid={errors.has("bot_endpoint")}
                 error={errors.get("bot_endpoint")}
+                oninput={endpointChanged}
+                onenter={loadDefinition}
                 placeholder={i18nKey("https://my_openchat_bot")}
                 bind:value={candidate.endpoint} />
         </div>
         <div class="icon">
             {#if !errors.has("bot_endpoint")}
-                <HoverIcon onclick={loadDefinition}>
-                    <Reload size={$iconSize} color={"var(--icon-txt)"}></Reload>
+                <HoverIcon title={"load definition"} onclick={loadDefinition}>
+                    <Reload
+                        size={$iconSize}
+                        color={schemaLoaded ? "var(--icon-txt)" : "var(--accent)"}></Reload>
                 </HoverIcon>
             {/if}
         </div>
diff --git a/frontend/app/src/components/bots/BotAvatar.svelte b/frontend/app/src/components/bots/BotAvatar.svelte
new file mode 100644
index 0000000000..a00751a01e
--- /dev/null
+++ b/frontend/app/src/components/bots/BotAvatar.svelte
@@ -0,0 +1,12 @@
+<script lang="ts">
+    import { AvatarSize } from "openchat-client";
+    import Avatar from "../Avatar.svelte";
+
+    interface Props {
+        bot: { avatarUrl?: string };
+    }
+
+    let { bot }: Props = $props();
+</script>
+
+<Avatar url={bot.avatarUrl ?? "/assets/bot_avatar.svg"} size={AvatarSize.Default} />
diff --git a/frontend/app/src/components/bots/BotBuilder.svelte b/frontend/app/src/components/bots/BotBuilder.svelte
index c744d62671..a5301da0c8 100644
--- a/frontend/app/src/components/bots/BotBuilder.svelte
+++ b/frontend/app/src/components/bots/BotBuilder.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import {
+        currentUser,
         emptyBotInstance,
         emptySlashCommandPermissions,
         OpenChat,
@@ -33,7 +34,7 @@
     let selectedCommand = $state<SlashCommandSchema | undefined>(undefined);
     let selectedCommandIndex = $state<number | undefined>(undefined);
     let debug = $state(false);
-    let candidate = $state<ExternalBot>(emptyBotInstance());
+    let candidate = $state<ExternalBot>(emptyBotInstance($currentUser.userId));
 
     let errors = $derived.by(
         debouncedDerived(
diff --git a/frontend/app/src/components/bots/BotBuilderModal.svelte b/frontend/app/src/components/bots/BotBuilderModal.svelte
index d817838438..9ac88ea6c6 100644
--- a/frontend/app/src/components/bots/BotBuilderModal.svelte
+++ b/frontend/app/src/components/bots/BotBuilderModal.svelte
@@ -1,5 +1,12 @@
 <script lang="ts">
-    import { currentUser, emptyBotInstance, OpenChat } from "openchat-client";
+    import {
+        AvatarSize,
+        currentUser,
+        emptyBotInstance,
+        externalBots,
+        OpenChat,
+        type BotMatch,
+    } from "openchat-client";
     import { i18nKey } from "../../i18n/i18n";
     import ModalContent from "../ModalContent.svelte";
     import Translatable from "../Translatable.svelte";
@@ -9,24 +16,43 @@
     import { getContext } from "svelte";
     import { toastStore } from "../../stores/toast";
     import ButtonGroup from "../ButtonGroup.svelte";
+    import AlertBox from "../AlertBox.svelte";
+    import Avatar from "../Avatar.svelte";
 
     const client = getContext<OpenChat>("client");
 
     interface Props {
         onClose: () => void;
+        mode: "register" | "update";
     }
 
-    let { onClose }: Props = $props();
+    let { onClose, mode = "register" }: Props = $props();
 
     let valid = $state(false);
-    let registering = $state(false);
+    let busy = $state(false);
+    let step: "choose" | "edit" = $state(mode === "update" ? "choose" : "edit");
 
-    let bot = $state(emptyBotInstance());
+    let botState = $state({
+        original: emptyBotInstance($currentUser.userId),
+        current: emptyBotInstance($currentUser.userId),
+    });
+
+    let ownerDirty = $derived(botState.original.ownerId !== botState.current.ownerId);
+    let nameDirty = $derived(botState.original.name !== botState.current.name);
+    let avatarDirty = $derived(botState.original.avatarUrl !== botState.current.avatarUrl);
+    let endpointDirty = $derived(botState.original.endpoint !== botState.current.endpoint);
+    let dirty = $derived(ownerDirty || nameDirty || avatarDirty || endpointDirty);
+
+    let myBots = $derived(
+        mode === "update"
+            ? [...$externalBots.values()].filter((b) => b.ownerId === $currentUser.userId)
+            : [],
+    );
 
     function register() {
-        if (bot !== undefined && valid) {
-            registering = true;
-            const snapshot = $state.snapshot(bot);
+        if (botState.current !== undefined && valid) {
+            busy = true;
+            const snapshot = $state.snapshot(botState.current);
             client
                 .registerBot({
                     ...snapshot,
@@ -40,17 +66,92 @@
                         onClose();
                     }
                 })
-                .finally(() => (registering = false));
+                .finally(() => (busy = false));
+        }
+    }
+
+    function update() {
+        if (botState.current !== undefined && valid) {
+            busy = true;
+            const { id, ownerId, name, avatarUrl, endpoint } = $state.snapshot(botState.current);
+            client
+                .updateRegisteredBot(
+                    id,
+                    ownerDirty ? ownerId : undefined,
+                    nameDirty ? name : undefined,
+                    avatarDirty ? avatarUrl : undefined,
+                    endpointDirty ? endpoint : undefined,
+                )
+                .then((success) => {
+                    if (!success) {
+                        toastStore.showFailureToast(i18nKey("Unable to register test bot"));
+                    } else {
+                        console.log("Bot registered");
+                        onClose();
+                    }
+                })
+                .finally(() => (busy = false));
+        }
+    }
+
+    function selectBot({ id }: BotMatch) {
+        const b = $externalBots.get(id);
+        if (b !== undefined) {
+            if (b.ownerId === $currentUser.userId) {
+                botState.original = b;
+                botState.current = structuredClone(b);
+                step = "edit";
+            }
         }
     }
 </script>
 
 <ModalContent on:close={onClose}>
     <div class="header" slot="header">
-        <Translatable resourceKey={i18nKey("bots.builder.title")}></Translatable>
+        <Translatable
+            resourceKey={mode === "update"
+                ? i18nKey("bots.update_bot.title")
+                : i18nKey("bots.builder.title")}></Translatable>
     </div>
     <div class="body" slot="body">
-        <BotBuilder onUpdate={(b) => (bot = b)} bind:valid />
+        {#if step === "choose"}
+            {#if myBots.length === 0}
+                <AlertBox>
+                    <Translatable resourceKey={i18nKey("bots.update_bot.nobots")}></Translatable>
+                </AlertBox>
+            {:else}
+                <p class="info">
+                    <Translatable resourceKey={i18nKey("bots.update_bot.select")}></Translatable>
+                </p>
+                <div class="bots">
+                    {#each myBots as myBot}
+                        <!-- svelte-ignore a11y_click_events_have_key_events -->
+                        <!-- svelte-ignore a11y_no_static_element_interactions -->
+                        <div onclick={() => selectBot(myBot)} class="match">
+                            <span class="avatar">
+                                <Avatar
+                                    url={myBot.avatarUrl ?? "/assets/bot_avatar.svg"}
+                                    size={AvatarSize.Default} />
+                            </span>
+                            <div class="details">
+                                <h4 class="bot-name">
+                                    {myBot.name}
+                                </h4>
+                                <p title={myBot.definition.description} class="bot-desc">
+                                    {myBot.definition.description}
+                                </p>
+                            </div>
+                        </div>
+                    {/each}
+                </div>
+            {/if}
+        {:else if step === "edit" && botState.current !== undefined}
+            <BotBuilder
+                {nameDirty}
+                candidate={botState.current}
+                onUpdate={(b) => (botState.current = b)}
+                bind:valid />
+        {/if}
     </div>
     <div class="footer" slot="footer">
         <ButtonGroup>
@@ -58,13 +159,68 @@
                 <Translatable resourceKey={i18nKey("cancel")} />
             </Button>
             <Button
-                on:click={register}
-                disabled={!valid || registering}
-                loading={registering}
+                on:click={mode === "update" ? update : register}
+                disabled={!valid || busy || !dirty}
+                loading={busy}
                 small={!$mobileWidth}
                 tiny={$mobileWidth}>
-                <Translatable resourceKey={i18nKey("Register")} />
+                <Translatable
+                    resourceKey={mode === "update"
+                        ? i18nKey("bots.update_bot.action")
+                        : i18nKey("bots.add.action")} />
             </Button>
         </ButtonGroup>
     </div>
 </ModalContent>
+
+<style lang="scss">
+    .bots {
+        max-height: 500px;
+        overflow: auto;
+    }
+
+    .match {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding: $sp4;
+        transition:
+            background-color ease-in-out 100ms,
+            border-color ease-in-out 100ms;
+        gap: 12px;
+        cursor: pointer;
+
+        @media (hover: hover) {
+            &:hover {
+                background-color: var(--members-hv);
+            }
+        }
+
+        @include mobile() {
+            padding: $sp3 toRem(10);
+        }
+    }
+    .avatar {
+        flex: 0 0 50px;
+        position: relative;
+        align-self: start;
+    }
+
+    .details {
+        display: flex;
+        gap: $sp2;
+        flex: 1;
+        flex-direction: column;
+        @include font(book, normal, fs-100);
+
+        .bot-name {
+            @include ellipsis();
+        }
+
+        .bot-desc {
+            @include font(light, normal, fs-100);
+            color: var(--txt-light);
+            @include clamp(2);
+        }
+    }
+</style>
diff --git a/frontend/app/src/components/bots/BotExplorer.svelte b/frontend/app/src/components/bots/BotExplorer.svelte
index 7cfadf5e69..7f84e72415 100644
--- a/frontend/app/src/components/bots/BotExplorer.svelte
+++ b/frontend/app/src/components/bots/BotExplorer.svelte
@@ -1,25 +1,19 @@
 <script lang="ts">
-    import {
-        i18nKey,
-        type CommunityIdentifier,
-        type GroupChatIdentifier,
-        type OpenChat,
-    } from "openchat-client";
+    import { i18nKey, type BotMatch, type OpenChat } from "openchat-client";
     import Search from "../Search.svelte";
-    import { getContext } from "svelte";
+    import { getContext, type Snippet } from "svelte";
     import { botSearchState } from "../../stores/search.svelte";
     import Button from "../Button.svelte";
     import Translatable from "../Translatable.svelte";
-    import BotMatch from "./BotMatch.svelte";
 
     const client = getContext<OpenChat>("client");
     const PAGE_SIZE = 50;
 
     interface Props {
-        id: CommunityIdentifier | GroupChatIdentifier;
+        botMatch: Snippet<[BotMatch]>;
     }
 
-    let { id }: Props = $props();
+    let { botMatch }: Props = $props();
 
     let initialised = $state(false);
     let searching = $state(false);
@@ -75,7 +69,7 @@
 {/if}
 
 {#each botSearchState.results as match}
-    <BotMatch {id} {match} />
+    {@render botMatch(match)}
 {/each}
 
 <style lang="scss"></style>
diff --git a/frontend/app/src/components/bots/BotMatch.svelte b/frontend/app/src/components/bots/BotMatch.svelte
index 11b2f0053b..e7dc926e4f 100644
--- a/frontend/app/src/components/bots/BotMatch.svelte
+++ b/frontend/app/src/components/bots/BotMatch.svelte
@@ -1,14 +1,13 @@
 <script lang="ts">
     import {
-        AvatarSize,
         type BotMatch,
         type CommunityIdentifier,
         type GroupChatIdentifier,
     } from "openchat-client";
-    import Avatar from "../Avatar.svelte";
     import BotSummary from "./BotSummary.svelte";
     import TooltipWrapper from "../TooltipWrapper.svelte";
     import TooltipPopup from "../TooltipPopup.svelte";
+    import BotAvatar from "./BotAvatar.svelte";
 
     interface Props {
         match: BotMatch;
@@ -27,7 +26,7 @@
 <!-- svelte-ignore a11y_no_static_element_interactions -->
 <div class="bot-match" onclick={() => (showing = true)}>
     <span class="avatar">
-        <Avatar url={match.avatarUrl} size={AvatarSize.Default} />
+        <BotAvatar bot={match} />
     </span>
     <div class="details">
         <h4 class="bot-name">
diff --git a/frontend/app/src/components/bots/BotMember.svelte b/frontend/app/src/components/bots/BotMember.svelte
index 8337e5f694..f5802742f1 100644
--- a/frontend/app/src/components/bots/BotMember.svelte
+++ b/frontend/app/src/components/bots/BotMember.svelte
@@ -9,10 +9,9 @@
     import MenuItem from "../MenuItem.svelte";
     import { _ } from "svelte-i18n";
     import { iconSize } from "../../stores/iconSize";
-    import { AvatarSize, type ExternalBot } from "openchat-shared";
+    import { type ExternalBot } from "openchat-shared";
     import Translatable from "../Translatable.svelte";
     import { i18nKey } from "../../i18n/i18n";
-    import Avatar from "../Avatar.svelte";
     import FilteredUsername from "../FilteredUsername.svelte";
     import type {
         CommunityIdentifier,
@@ -23,6 +22,7 @@
     import { getContext } from "svelte";
     import { toastStore } from "../../stores/toast";
     import BotSummary from "./BotSummary.svelte";
+    import BotAvatar from "./BotAvatar.svelte";
 
     const client = getContext<OpenChat>("client");
 
@@ -38,7 +38,7 @@
     let reviewMode: "editing" | "viewing" | undefined = $state(undefined);
 
     function removeBot() {
-        client.removeBot(id, bot.id).then((success) => {
+        client.removeInstalledBot(id, bot.id).then((success) => {
             if (!success) {
                 toastStore.showFailureToast(i18nKey("bots.manage.removeFailed"));
             }
@@ -67,9 +67,11 @@
         {bot} />
 {/if}
 
-<div class="bot_member" role="button">
+<!-- svelte-ignore a11y_interactive_supports_focus -->
+<!-- svelte-ignore a11y_click_events_have_key_events -->
+<div class="bot_member" role="button" onclick={viewBotDetails}>
     <span class="avatar">
-        <Avatar userId={bot.id} url={bot.avatarUrl} size={AvatarSize.Default} />
+        <BotAvatar {bot} />
     </span>
     <div class="details">
         <div class="bot_name">
diff --git a/frontend/app/src/components/bots/BotSummary.svelte b/frontend/app/src/components/bots/BotSummary.svelte
index 4c705a7c31..8455fb4459 100644
--- a/frontend/app/src/components/bots/BotSummary.svelte
+++ b/frontend/app/src/components/bots/BotSummary.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
     import {
-        AvatarSize,
         emptySlashCommandPermissions,
         OpenChat,
         type BotMatch,
@@ -9,7 +8,6 @@
         type CommunityIdentifier,
         type GroupChatIdentifier,
     } from "openchat-client";
-    import Avatar from "../Avatar.svelte";
     import { getContext } from "svelte";
     import Overlay from "../Overlay.svelte";
     import ModalContent from "../ModalContent.svelte";
@@ -25,6 +23,7 @@
     import Checkbox from "../Checkbox.svelte";
     import { togglePermission } from "../../utils/bots";
     import { toastStore } from "../../stores/toast";
+    import BotAvatar from "./BotAvatar.svelte";
 
     const client = getContext<OpenChat>("client");
 
@@ -100,7 +99,7 @@
     function updateBot() {
         busy = true;
         client
-            .updateBot(id, bot.id, $state.snapshot(grantedPermissions))
+            .updateInstalledBot(id, bot.id, $state.snapshot(grantedPermissions))
             .then((success) => {
                 if (!success) {
                     toastStore.showFailureToast(i18nKey("bots.edit.failure"));
@@ -132,7 +131,7 @@
         </div>
         <div class="body" slot="body">
             <span class="avatar">
-                <Avatar url={bot.avatarUrl} size={AvatarSize.Default} />
+                <BotAvatar {bot} />
             </span>
             <div class="details">
                 <h4 class="bot-name">
diff --git a/frontend/app/src/components/bots/CommandSelector.svelte b/frontend/app/src/components/bots/CommandSelector.svelte
index b3d20531c7..ffd5675aaa 100644
--- a/frontend/app/src/components/bots/CommandSelector.svelte
+++ b/frontend/app/src/components/bots/CommandSelector.svelte
@@ -45,6 +45,7 @@
     import { toastStore } from "../../stores/toast";
     import TooltipWrapper from "../TooltipWrapper.svelte";
     import TooltipPopup from "../TooltipPopup.svelte";
+    import BotAvatar from "./BotAvatar.svelte";
 
     interface Props {
         onCancel: () => void;
@@ -204,7 +205,7 @@
             class:selected={$focusedCommandIndex === i}
             onclick={() => selectCommand(command)}>
             {#if command.kind === "external_bot"}
-                <img class="icon" src={command.botIcon} alt={command.botName} />
+                <BotAvatar bot={command} />
             {:else}
                 <Logo />
             {/if}
diff --git a/frontend/app/src/components/bots/ValidatingInput.svelte b/frontend/app/src/components/bots/ValidatingInput.svelte
index 66e3fcc9f5..cf20e77aca 100644
--- a/frontend/app/src/components/bots/ValidatingInput.svelte
+++ b/frontend/app/src/components/bots/ValidatingInput.svelte
@@ -7,25 +7,27 @@
 
     type Props = InputProps & { error: ResourceKey[] };
 
-    let { disabled, error, value = $bindable(), ...props }: Props = $props();
+    let { onblur, onfocus, disabled, error, value = $bindable(), ...props }: Props = $props();
     let showError = $state(disabled);
     let timer = $state<number | undefined>(undefined);
     let firstError = $derived(error[0]);
 
-    function onfocus() {
+    function onFocusInternal() {
         timer = window.setTimeout(() => (showError = true), 250);
+        onfocus?.();
     }
 
-    function onblur() {
+    function onBlurInternal() {
         if (timer) {
             window.clearTimeout(timer);
         }
         showError = disabled;
+        onblur?.();
     }
 </script>
 
 <div class:error={firstError !== undefined && showError} class="validating-input">
-    <Input {onfocus} {onblur} {disabled} {...props} bind:value>
+    <Input onfocus={onFocusInternal} onblur={onBlurInternal} {disabled} {...props} bind:value>
         {#if firstError !== undefined && showError}
             <div class="error-wrapper" class:disabled>
                 <ErrorMessage>
diff --git a/frontend/app/src/components/bots/botState.ts b/frontend/app/src/components/bots/botState.ts
index 7c63c414dd..6b0926b3e8 100644
--- a/frontend/app/src/components/bots/botState.ts
+++ b/frontend/app/src/components/bots/botState.ts
@@ -79,7 +79,7 @@ export const commands = derived(
                                 ...c,
                                 kind: b.kind,
                                 botName: b.name,
-                                botIcon: b.avatarUrl,
+                                avatarUrl: b.avatarUrl,
                                 botId: b.id,
                                 botEndpoint: b.endpoint,
                                 botDescription: b.definition.description,
diff --git a/frontend/app/src/components/home/Home.svelte b/frontend/app/src/components/home/Home.svelte
index 785fcf2ecd..6ded09c3f7 100644
--- a/frontend/app/src/components/home/Home.svelte
+++ b/frontend/app/src/components/home/Home.svelte
@@ -182,6 +182,7 @@
         | { kind: "verify_humanity" }
         | { kind: "select_chat" }
         | { kind: "register_bot" }
+        | { kind: "update_bot" }
         | { kind: "suspended" }
         | { kind: "no_access" }
         | { kind: "new_group"; embeddedContent: boolean; candidate: CandidateGroupChat }
@@ -270,7 +271,7 @@
         } else if (ev instanceof RegisterBot) {
             modal = { kind: "register_bot" };
         } else if (ev instanceof UpdateBot) {
-            modal = { kind: "register_bot" };
+            modal = { kind: "update_bot" };
         } else if (ev instanceof SummonWitch) {
             summonWitch();
         } else if (ev instanceof RemoteVideoCallStartedEvent) {
@@ -1333,7 +1334,9 @@
         {:else if modal.kind === "suspended"}
             <SuspendedModal on:close={closeModal} />
         {:else if modal.kind === "register_bot"}
-            <BotBuilderModal onClose={closeModal} />
+            <BotBuilderModal mode={"register"} onClose={closeModal} />
+        {:else if modal.kind === "update_bot"}
+            <BotBuilderModal mode={"update"} onClose={closeModal} />
         {:else if modal.kind === "no_access"}
             <NoAccess on:close={closeNoAccess} />
         {:else if modal.kind === "not_found"}
diff --git a/frontend/app/src/components/home/MakeProposalModal.svelte b/frontend/app/src/components/home/MakeProposalModal.svelte
index 64cf2e07db..34dc25f96e 100644
--- a/frontend/app/src/components/home/MakeProposalModal.svelte
+++ b/frontend/app/src/components/home/MakeProposalModal.svelte
@@ -14,8 +14,10 @@
         type Treasury,
         currentUser as user,
         cryptoBalance as cryptoBalanceStore,
+        currentUser,
     } from "openchat-client";
     import {
+        emptyBotInstance,
         isPrincipalValid,
         isSubAccountValid,
         isUrl,
@@ -101,7 +103,7 @@
     let refreshingBalance = false;
     let balanceWithRefresh: BalanceWithRefresh;
     let achivementName = "";
-    let candidateBot: ExternalBot | undefined = undefined;
+    let candidateBot: ExternalBot = emptyBotInstance($currentUser.userId);
     let candidateBotValid = false;
 
     $: errorMessage =
@@ -511,6 +513,8 @@
             <div class="action hidden" class:visible={step === 2}>
                 {#if selectedProposalType === "register_bot"}
                     <BotBuilder
+                        candidate={candidateBot}
+                        nameDirty={true}
                         onUpdate={(bot) => (candidateBot = bot)}
                         bind:valid={candidateBotValid} />
                 {:else if selectedProposalType === "transfer_sns_funds"}
diff --git a/frontend/app/src/components/home/SingleUserSelector.svelte b/frontend/app/src/components/home/SingleUserSelector.svelte
index b8da0761d8..4a06e95990 100644
--- a/frontend/app/src/components/home/SingleUserSelector.svelte
+++ b/frontend/app/src/components/home/SingleUserSelector.svelte
@@ -1,9 +1,15 @@
 <script lang="ts">
     import MentionPicker from "./MentionPicker.svelte";
     import { _ } from "svelte-i18n";
-    import type { OpenChat, UserOrUserGroup } from "openchat-client";
+    import {
+        i18nKey,
+        type OpenChat,
+        type ResourceKey,
+        type UserOrUserGroup,
+    } from "openchat-client";
     import { createEventDispatcher, getContext } from "svelte";
     import UserPill from "../UserPill.svelte";
+    import ValidatingInput from "../bots/ValidatingInput.svelte";
 
     const client = getContext<OpenChat>("client");
     const dispatch = createEventDispatcher();
@@ -12,6 +18,10 @@
     export let selectedReceiver: UserOrUserGroup | undefined = undefined;
     export let direction: "up" | "down" = "down";
     export let placeholder: string = "tokenTransfer.chooseReceiver";
+    export let border = true;
+    export let mentionSelf = false;
+    export let error: ResourceKey[] = [];
+    export let invalid = false;
 
     let showMentionPicker = false;
     let textValue: string = "";
@@ -49,8 +59,9 @@
         <MentionPicker
             offset={inputHeight}
             {direction}
+            {mentionSelf}
             on:mention={selectReceiver}
-            border
+            {border}
             usersOnly
             prefix={textValue.startsWith("@") ? textValue.substring(1) : textValue} />
     {/if}
@@ -58,15 +69,16 @@
         <UserPill on:deleteUser={removeReceiver} userOrGroup={selectedReceiver} />
     {:else}
         <div class="wrapper" bind:clientHeight={inputHeight}>
-            <input
-                on:focus={() => (showMentionPicker = true)}
-                on:blur={blur}
-                class:showing-picker={showMentionPicker}
-                class="text-box"
-                maxlength="100"
+            <ValidatingInput
+                onfocus={() => (showMentionPicker = true)}
+                onblur={blur}
+                {invalid}
+                {error}
                 {autofocus}
                 bind:value={textValue}
-                placeholder={$_(placeholder)} />
+                maxlength={100}
+                placeholder={i18nKey(placeholder)}>
+            </ValidatingInput>
         </div>
     {/if}
 </div>
@@ -76,16 +88,4 @@
         position: relative;
         margin-bottom: $sp4;
     }
-
-    .text-box {
-        transition: border ease-in-out 300ms;
-        display: block;
-        width: 100%;
-
-        @include input();
-
-        &::placeholder {
-            color: var(--placeholder);
-        }
-    }
 </style>
diff --git a/frontend/app/src/components/home/groupdetails/Members.svelte b/frontend/app/src/components/home/groupdetails/Members.svelte
index 053bb2824f..4d7401847a 100644
--- a/frontend/app/src/components/home/groupdetails/Members.svelte
+++ b/frontend/app/src/components/home/groupdetails/Members.svelte
@@ -26,6 +26,7 @@
         type ExternalBot,
         externalBots,
         type SlashCommandPermissions,
+        type BotMatch as BotMatchType,
     } from "openchat-client";
     import { createEventDispatcher, getContext } from "svelte";
     import InvitedUser from "./InvitedUser.svelte";
@@ -38,6 +39,7 @@
     import { botsEnabled } from "../../../utils/bots";
     import BotExplorer from "../../bots/BotExplorer.svelte";
     import BotMember from "../../bots/BotMember.svelte";
+    import BotMatch from "../../bots/BotMatch.svelte";
 
     type EnhancedExternalBot = ExternalBot & { grantedPermissions: SlashCommandPermissions };
 
@@ -416,7 +418,11 @@
     </div>
 {:else if selectedTab === "add-bots" && collection.kind !== "channel"}
     <div class="bot-explorer">
-        <BotExplorer id={botContainer} />
+        <BotExplorer>
+            {#snippet botMatch(match: BotMatchType)}
+                <BotMatch id={botContainer} {match} />
+            {/snippet}
+        </BotExplorer>
     </div>
 {/if}
 
diff --git a/frontend/app/src/i18n/ar.json b/frontend/app/src/i18n/ar.json
index ef179f417a..193486df5d 100644
--- a/frontend/app/src/i18n/ar.json
+++ b/frontend/app/src/i18n/ar.json
@@ -150,9 +150,11 @@
     "blockUserSucceeded": "لقد تم حظر المستخدم",
     "bots": {
         "add": {
+            "action": "يسجل",
             "addBot": "إضافة بوت",
             "choosePermissions": "الأذونات",
             "failure": "نأسف لعدم تمكننا من إضافة البوت",
+            "loadDefinition": "تعريف الحمل",
             "noPermissions": "لا يتطلب أذونات خاصة",
             "permissionsInfo": "يسعى هذا الروبوت إلى الحصول على الأذونات التالية. سيؤدي اختيار تقييد الأذونات الممنوحة إلى تقييد الأوامر المتاحة.",
             "title": "إضافة بوت إلى المجتمع"
@@ -173,6 +175,7 @@
             "commandNamePlaceholder": "أدخل اسم الأمر",
             "commandPermissionsDesc": "وصف الأذونات التي يتطلبها هذا الأمر",
             "commandPermissionsLabel": "أذونات الأوامر",
+            "commandsLabel": "الأوامر",
             "descLabel": "وصف البوت",
             "descPlaceholder": "أدخل وصف البوت",
             "endpointLabel": "نقطة نهاية البوت",
@@ -187,6 +190,7 @@
                 "minLength": "يجب أن يحتوي على {n} حرفًا على الأقل",
                 "nameCheckError": "حدث خطأ أثناء التحقق من اسم الروبوت",
                 "noCommands": "يجب أن يحتوي الروبوت على أمر واحد على الأقل",
+                "owner": "يجب عليك إدخال مالك للبوت",
                 "principal": "يجب عليك إدخال مدير صالح لتحديد الروبوت"
             },
             "iconLabel": "أيقونة البوت",
@@ -202,6 +206,8 @@
             "namePlaceholder": "أدخل اسم البوت",
             "nameRules": "يجب أن يكون فريدًا ويحتوي على أحرف أبجدية رقمية وعلامات سفلية فقط",
             "optional": "خياري",
+            "ownerLabel": "مالك البوت",
+            "ownerRules": "من هو نقطة الاتصال لهذا الروبوت؟",
             "paramDescLabel": "وصف المعلمة",
             "paramDescPlaceholder": "أدخل وصف المعلمة",
             "paramLabel": "المعلمة: {name}",
@@ -209,6 +215,7 @@
             "paramNamePlaceholder": "أدخل اسم المعلمة",
             "paramPlaceholderLabel": "عنصر نائب للمعلمة",
             "paramPlaceholderPlaceholder": "أدخل عنصر نائب للمعلمة",
+            "paramsLabel": "حدود",
             "paramTypeLabel": "نوع المعلمة",
             "permSameAsMessage": "نفس أذونات الرسالة",
             "permScopeChat": "محادثة",
@@ -325,7 +332,11 @@
             }
         },
         "update_bot": {
-            "desc": "ابدأ اقتراحًا لتحديث روبوت OpenChat الحالي"
+            "action": "تحديث",
+            "desc": "ابدأ اقتراحًا لتحديث روبوت OpenChat الحالي",
+            "nobots": "لا يمكن تحديث الروبوت إلا من قبل مالك الروبوت المسجل. أنت لست مالك أي روبوت مسجل.",
+            "select": "حدد الروبوت الذي تريد تحديثه.",
+            "title": "تحديث البوت"
         },
         "view": {
             "close": "يغلق",
diff --git a/frontend/app/src/i18n/cn.json b/frontend/app/src/i18n/cn.json
index 9fbf266295..2d394dbeb5 100644
--- a/frontend/app/src/i18n/cn.json
+++ b/frontend/app/src/i18n/cn.json
@@ -150,9 +150,11 @@
     "blockUserSucceeded": "该用户已被加入黑名单",
     "bots": {
         "add": {
+            "action": "登记",
             "addBot": "添加机器人",
             "choosePermissions": "权限",
             "failure": "抱歉，我们无法添加该机器人",
+            "loadDefinition": "荷载定义",
             "noPermissions": "无需特殊权限",
             "permissionsInfo": "此机器人寻求以下权限。选择限制授予的权限将限制可用的命令。",
             "title": "将机器人添加到社区"
@@ -173,6 +175,7 @@
             "commandNamePlaceholder": "输入命令名称",
             "commandPermissionsDesc": "描述此命令所需的权限",
             "commandPermissionsLabel": "命令权限",
+            "commandsLabel": "命令",
             "descLabel": "机器人描述",
             "descPlaceholder": "输入机器人描述",
             "endpointLabel": "机器人端点",
@@ -187,6 +190,7 @@
                 "minLength": "必须至少包含 {n} 个字符",
                 "nameCheckError": "检查机器人名称时出错",
                 "noCommands": "机器人必须至少包含一个命令",
+                "owner": "您必须输入机器人的所有者",
                 "principal": "您必须输入有效的主体来识别机器人"
             },
             "iconLabel": "机器人图标",
@@ -202,6 +206,8 @@
             "namePlaceholder": "输入机器人名称",
             "nameRules": "必须是唯一的，并且仅包含字母数字字符和下划线",
             "optional": "选修的",
+            "ownerLabel": "机器人所有者",
+            "ownerRules": "该机器人的联系人是谁",
             "paramDescLabel": "参数说明",
             "paramDescPlaceholder": "输入参数描述",
             "paramLabel": "参数：{name}",
@@ -209,6 +215,7 @@
             "paramNamePlaceholder": "输入参数名称",
             "paramPlaceholderLabel": "参数占位符",
             "paramPlaceholderPlaceholder": "输入参数占位符",
+            "paramsLabel": "参数",
             "paramTypeLabel": "参数类型",
             "permSameAsMessage": "与消息权限相同",
             "permScopeChat": "聊天",
@@ -325,7 +332,11 @@
             }
         },
         "update_bot": {
-            "desc": "发起更新现有 OpenChat 机器人的提案"
+            "action": "更新",
+            "desc": "发起更新现有 OpenChat 机器人的提案",
+            "nobots": "只有已注册机器人的所有者才能更新机器人。您不是任何已注册机器人的所有者。",
+            "select": "选择您想要更新的机器人。",
+            "title": "更新机器人"
         },
         "view": {
             "close": "关闭",
diff --git a/frontend/app/src/i18n/de.json b/frontend/app/src/i18n/de.json
index d05757820c..08c450d492 100644
--- a/frontend/app/src/i18n/de.json
+++ b/frontend/app/src/i18n/de.json
@@ -150,9 +150,11 @@
     "blockUserSucceeded": "Benutzer wurde gesperrt",
     "bots": {
         "add": {
+            "action": "Registrieren",
             "addBot": "Bot hinzufügen",
             "choosePermissions": "Berechtigungen",
             "failure": "Es ist uns leider nicht gelungen, den Bot hinzuzufügen.",
+            "loadDefinition": "Lastdefinition",
             "noPermissions": "Keine besonderen Berechtigungen erforderlich",
             "permissionsInfo": "Dieser Bot fordert die folgenden Berechtigungen an. Wenn Sie die erteilten Berechtigungen einschränken, werden auch die verfügbaren Befehle eingeschränkt.",
             "title": "Bot zur Community hinzufügen"
@@ -173,6 +175,7 @@
             "commandNamePlaceholder": "Geben Sie den Befehlsnamen ein",
             "commandPermissionsDesc": "Beschreiben Sie die Berechtigungen, die dieser Befehl erfordert",
             "commandPermissionsLabel": "Befehlsberechtigungen",
+            "commandsLabel": "Befehle",
             "descLabel": "Bot-Beschreibung",
             "descPlaceholder": "Geben Sie die Bot-Beschreibung ein",
             "endpointLabel": "Bot-Endpunkt",
@@ -187,6 +190,7 @@
                 "minLength": "Muss mindestens {n} Zeichen haben",
                 "nameCheckError": "Beim Überprüfen des Botnamens ist ein Fehler aufgetreten",
                 "noCommands": "Ein Bot muss mindestens einen Befehl enthalten",
+                "owner": "Sie müssen einen Besitzer für den Bot eingeben",
                 "principal": "Sie müssen einen gültigen Auftraggeber eingeben, um den Bot zu identifizieren"
             },
             "iconLabel": "Bot-Symbol",
@@ -202,6 +206,8 @@
             "namePlaceholder": "Geben Sie den Bot-Namen ein",
             "nameRules": "Muss eindeutig sein und darf nur alphanumerische Zeichen und Unterstriche enthalten",
             "optional": "optional",
+            "ownerLabel": "Bot-Besitzer",
+            "ownerRules": "Wer ist der Ansprechpartner für diesen Bot",
             "paramDescLabel": "Parameterbeschreibung",
             "paramDescPlaceholder": "Geben Sie eine Parameterbeschreibung ein",
             "paramLabel": "Parameter: {name}",
@@ -209,6 +215,7 @@
             "paramNamePlaceholder": "Geben Sie den Parameternamen ein",
             "paramPlaceholderLabel": "Parameterplatzhalter",
             "paramPlaceholderPlaceholder": "Parameterplatzhalter eingeben",
+            "paramsLabel": "Parameter",
             "paramTypeLabel": "Parametertyp",
             "permSameAsMessage": "Gleich wie Nachrichtenberechtigungen",
             "permScopeChat": "Chat",
@@ -325,7 +332,11 @@
             }
         },
         "update_bot": {
-            "desc": "Starten Sie einen Vorschlag zur Aktualisierung eines vorhandenen OpenChat-Bots"
+            "action": "Aktualisieren",
+            "desc": "Starten Sie einen Vorschlag zur Aktualisierung eines vorhandenen OpenChat-Bots",
+            "nobots": "Nur der Besitzer eines registrierten Bots kann diesen aktualisieren. Sie sind nicht der Besitzer eines registrierten Bots.",
+            "select": "Wählen Sie den Bot aus, den Sie aktualisieren möchten.",
+            "title": "Bot aktualisieren"
         },
         "view": {
             "close": "Schließen",
diff --git a/frontend/app/src/i18n/en.json b/frontend/app/src/i18n/en.json
index 038abd7e14..e6e84b79e5 100644
--- a/frontend/app/src/i18n/en.json
+++ b/frontend/app/src/i18n/en.json
@@ -150,13 +150,14 @@
     "blockUserSucceeded": "User has been blocked",
     "bots": {
         "add": {
+            "action": "Register",
             "addBot": "Add bot",
             "choosePermissions": "Permissions",
             "failure": "Sorry we were unable to add the bot",
+            "loadDefinition": "Load definition",
             "noPermissions": "No special permissions required",
             "permissionsInfo": "This bot seeks the following permissions. Choosing to limit the permissions granted will limit the commands available.",
-            "title": "Add bot to community",
-            "loadDefinition": "Load definition"
+            "title": "Add bot to community"
         },
         "builder": {
             "addAnother": "Add another",
@@ -171,10 +172,10 @@
             "commandDescPlaceholder": "Enter command description",
             "commandLabel": "/{name}",
             "commandNameLabel": "Command name",
-            "commandsLabel": "Commands",
             "commandNamePlaceholder": "Enter command name",
             "commandPermissionsDesc": "Describe the permissions that this command requires",
             "commandPermissionsLabel": "Command permissions",
+            "commandsLabel": "Commands",
             "descLabel": "Bot description",
             "descPlaceholder": "Enter bot description",
             "endpointLabel": "Bot endpoint",
@@ -189,6 +190,7 @@
                 "minLength": "Must have at least {n} characters",
                 "nameCheckError": "There was an error checking the bot name",
                 "noCommands": "A bot must contain at least one command",
+                "owner": "You must enter an owner for the bot",
                 "principal": "You must enter a valid principal to identify the bot"
             },
             "iconLabel": "Bot avatar",
@@ -204,14 +206,16 @@
             "namePlaceholder": "Enter bot name",
             "nameRules": "Must be unique and contain alphanumeric characters and underscores only",
             "optional": "optional",
+            "ownerLabel": "Bot owner",
+            "ownerRules": "Who is the point of contact for this bot",
             "paramDescLabel": "Parameter description",
             "paramDescPlaceholder": "Enter parameter description",
             "paramLabel": "Param: {name}",
             "paramNameLabel": "Parameter name",
-            "paramsLabel": "Parameters",
             "paramNamePlaceholder": "Enter parameter name",
             "paramPlaceholderLabel": "Parameter placeholder",
             "paramPlaceholderPlaceholder": "Enter parameter placeholder",
+            "paramsLabel": "Parameters",
             "paramTypeLabel": "Param type",
             "permSameAsMessage": "Same as message permissions",
             "permScopeChat": "Chat",
@@ -328,7 +332,11 @@
             }
         },
         "update_bot": {
-            "desc": "Start a proposal to update an existing OpenChat bot"
+            "action": "Update",
+            "desc": "Start a proposal to update an existing OpenChat bot",
+            "nobots": "Only the owner of a registerd bot can update the bot. You are not the owner of any registered bots.",
+            "select": "Select the bot that you would like to update.",
+            "title": "Update bot"
         },
         "view": {
             "close": "Close",
@@ -1864,4 +1872,4 @@
     "yourChats": "Your chats",
     "youreBlocked": "Sorry - you have been blocked from this group",
     "yourRoleChanged": "{changedBy} changed your role to {newRole}"
-}
+}
\ No newline at end of file
diff --git a/frontend/app/src/i18n/es.json b/frontend/app/src/i18n/es.json
index d76cb81104..e4f3bc2e60 100644
--- a/frontend/app/src/i18n/es.json
+++ b/frontend/app/src/i18n/es.json
@@ -150,9 +150,11 @@
     "blockUserSucceeded": "El usuario ha sido bloqueado",
     "bots": {
         "add": {
+            "action": "Registro",
             "addBot": "Agregar bot",
             "choosePermissions": "Permisos",
             "failure": "Lo sentimos, no pudimos agregar el bot.",
+            "loadDefinition": "Definición de carga",
             "noPermissions": "No se requieren permisos especiales",
             "permissionsInfo": "Este bot solicita los siguientes permisos. Si elige limitar los permisos otorgados, se limitarán los comandos disponibles.",
             "title": "Agregar bot a la comunidad"
@@ -173,6 +175,7 @@
             "commandNamePlaceholder": "Introduzca el nombre del comando",
             "commandPermissionsDesc": "Describe los permisos que requiere este comando",
             "commandPermissionsLabel": "Permisos de comando",
+            "commandsLabel": "Comandos",
             "descLabel": "Descripción del bot",
             "descPlaceholder": "Ingresar la descripción del bot",
             "endpointLabel": "Punto final del bot",
@@ -187,6 +190,7 @@
                 "minLength": "Debe tener al menos {n} caracteres",
                 "nameCheckError": "Se produjo un error al verificar el nombre del bot.",
                 "noCommands": "Un bot debe contener al menos un comando",
+                "owner": "Debes ingresar un propietario para el bot",
                 "principal": "Debes ingresar un principal válido para identificar el bot"
             },
             "iconLabel": "Icono de bot",
@@ -202,6 +206,8 @@
             "namePlaceholder": "Introduzca el nombre del bot",
             "nameRules": "Debe ser único y contener únicamente caracteres alfanuméricos y guiones bajos.",
             "optional": "opcional",
+            "ownerLabel": "Propietario del bot",
+            "ownerRules": "¿Quién es el punto de contacto para este bot?",
             "paramDescLabel": "Descripción de parámetros",
             "paramDescPlaceholder": "Introduzca la descripción del parámetro",
             "paramLabel": "Parámetro: {name}",
@@ -209,6 +215,7 @@
             "paramNamePlaceholder": "Introduzca el nombre del parámetro",
             "paramPlaceholderLabel": "Marcador de posición de parámetro",
             "paramPlaceholderPlaceholder": "Introduzca un marcador de posición de parámetro",
+            "paramsLabel": "Parámetros",
             "paramTypeLabel": "Tipo de parámetro",
             "permSameAsMessage": "Igual que los permisos de mensajes",
             "permScopeChat": "Charlar",
@@ -325,7 +332,11 @@
             }
         },
         "update_bot": {
-            "desc": "Iniciar una propuesta para actualizar un bot de OpenChat existente"
+            "action": "Actualizar",
+            "desc": "Iniciar una propuesta para actualizar un bot de OpenChat existente",
+            "nobots": "Solo el propietario de un bot registrado puede actualizarlo. No eres el propietario de ningún bot registrado.",
+            "select": "Seleccione el bot que desea actualizar.",
+            "title": "Actualizar bot"
         },
         "view": {
             "close": "Cerca",
diff --git a/frontend/app/src/i18n/fa.json b/frontend/app/src/i18n/fa.json
index 44719ef1fa..35a4012b36 100644
--- a/frontend/app/src/i18n/fa.json
+++ b/frontend/app/src/i18n/fa.json
@@ -150,9 +150,11 @@
     "blockUserSucceeded": "کاربر مسدود شده است",
     "bots": {
         "add": {
+            "action": "ثبت نام کنید",
             "addBot": "اضافه کردن ربات",
             "choosePermissions": "مجوزها",
             "failure": "متأسفیم که نتوانستیم ربات را اضافه کنیم",
+            "loadDefinition": "تعریف بار",
             "noPermissions": "هیچ مجوز خاصی لازم نیست",
             "permissionsInfo": "این ربات به دنبال مجوزهای زیر است. انتخاب محدود کردن مجوزهای اعطا شده، دستورات موجود را محدود می کند.",
             "title": "اضافه کردن ربات به انجمن"
@@ -173,6 +175,7 @@
             "commandNamePlaceholder": "نام فرمان را وارد کنید",
             "commandPermissionsDesc": "مجوزهای مورد نیاز این دستور را شرح دهید",
             "commandPermissionsLabel": "مجوزهای فرمان",
+            "commandsLabel": "دستورات",
             "descLabel": "توضیحات ربات",
             "descPlaceholder": "توضیحات ربات را وارد کنید",
             "endpointLabel": "نقطه پایانی ربات",
@@ -187,6 +190,7 @@
                 "minLength": "باید حداقل {n} کاراکتر داشته باشد",
                 "nameCheckError": "هنگام بررسی نام ربات خطایی روی داد",
                 "noCommands": "یک ربات باید حداقل یک دستور داشته باشد",
+                "owner": "باید یک مالک برای ربات وارد کنید",
                 "principal": "برای شناسایی ربات باید یک اصل معتبر وارد کنید"
             },
             "iconLabel": "نماد ربات",
@@ -202,6 +206,8 @@
             "namePlaceholder": "نام ربات را وارد کنید",
             "nameRules": "باید منحصر به فرد باشد و فقط شامل نویسه های الفبایی و زیرخط باشد",
             "optional": "اختیاری",
+            "ownerLabel": "صاحب ربات",
+            "ownerRules": "چه کسی نقطه تماس این ربات است",
             "paramDescLabel": "توضیحات پارامتر",
             "paramDescPlaceholder": "توضیحات پارامتر را وارد کنید",
             "paramLabel": "پارامتر: {name}",
@@ -209,6 +215,7 @@
             "paramNamePlaceholder": "نام پارامتر را وارد کنید",
             "paramPlaceholderLabel": "مکان نگهدار پارامتر",
             "paramPlaceholderPlaceholder": "متغیر پارامتر پارامتر را وارد کنید",
+            "paramsLabel": "پارامترها",
             "paramTypeLabel": "نوع پارام",
             "permSameAsMessage": "مانند مجوزهای پیام",
             "permScopeChat": "چت کنید",
@@ -325,7 +332,11 @@
             }
         },
         "update_bot": {
-            "desc": "پیشنهادی را برای به روز رسانی ربات OpenChat موجود شروع کنید"
+            "action": "به روز رسانی",
+            "desc": "پیشنهادی را برای به روز رسانی ربات OpenChat موجود شروع کنید",
+            "nobots": "فقط صاحب یک ربات ثبت شده می تواند ربات را به روز کند. شما مالک هیچ ربات ثبت شده ای نیستید.",
+            "select": "رباتی را که می خواهید به روز کنید انتخاب کنید.",
+            "title": "به روز رسانی ربات"
         },
         "view": {
             "close": "بستن",
diff --git a/frontend/app/src/i18n/fr.json b/frontend/app/src/i18n/fr.json
index d42dce1e9c..1e0ffd4d38 100644
--- a/frontend/app/src/i18n/fr.json
+++ b/frontend/app/src/i18n/fr.json
@@ -150,9 +150,11 @@
     "blockUserSucceeded": "L'utilisateur a été bloqué",
     "bots": {
         "add": {
+            "action": "Registre",
             "addBot": "Ajouter un bot",
             "choosePermissions": "Autorisations",
             "failure": "Désolé, nous n'avons pas pu ajouter le bot",
+            "loadDefinition": "Définition de la charge",
             "noPermissions": "Aucune autorisation spéciale requise",
             "permissionsInfo": "Ce bot recherche les autorisations suivantes. Choisir de limiter les autorisations accordées limitera les commandes disponibles.",
             "title": "Ajouter un bot à la communauté"
@@ -173,6 +175,7 @@
             "commandNamePlaceholder": "Entrer le nom de la commande",
             "commandPermissionsDesc": "Décrivez les autorisations requises par cette commande",
             "commandPermissionsLabel": "Autorisations de commande",
+            "commandsLabel": "Commandes",
             "descLabel": "Description du robot",
             "descPlaceholder": "Entrez la description du bot",
             "endpointLabel": "Point de terminaison du bot",
@@ -187,6 +190,7 @@
                 "minLength": "Doit avoir au moins {n} caractères",
                 "nameCheckError": "Une erreur s'est produite lors de la vérification du nom du bot",
                 "noCommands": "Un bot doit contenir au moins une commande",
+                "owner": "Vous devez entrer un propriétaire pour le bot",
                 "principal": "Vous devez entrer un principal valide pour identifier le bot"
             },
             "iconLabel": "Icône de bot",
@@ -202,6 +206,8 @@
             "namePlaceholder": "Entrez le nom du bot",
             "nameRules": "Doit être unique et contenir uniquement des caractères alphanumériques et des traits de soulignement",
             "optional": "facultatif",
+            "ownerLabel": "Propriétaire du bot",
+            "ownerRules": "Qui est le point de contact pour ce bot",
             "paramDescLabel": "Description des paramètres",
             "paramDescPlaceholder": "Entrer la description du paramètre",
             "paramLabel": "Paramètre : {name}",
@@ -209,6 +215,7 @@
             "paramNamePlaceholder": "Entrer le nom du paramètre",
             "paramPlaceholderLabel": "Espace réservé aux paramètres",
             "paramPlaceholderPlaceholder": "Entrer l'espace réservé au paramètre",
+            "paramsLabel": "Paramètres",
             "paramTypeLabel": "Type de paramètre",
             "permSameAsMessage": "Identique aux autorisations de message",
             "permScopeChat": "Chat",
@@ -325,7 +332,11 @@
             }
         },
         "update_bot": {
-            "desc": "Démarrer une proposition pour mettre à jour un bot OpenChat existant"
+            "action": "Mise à jour",
+            "desc": "Démarrer une proposition pour mettre à jour un bot OpenChat existant",
+            "nobots": "Seul le propriétaire d'un bot enregistré peut mettre à jour le bot. Vous n'êtes pas le propriétaire d'un bot enregistré.",
+            "select": "Sélectionnez le bot que vous souhaitez mettre à jour.",
+            "title": "Bot de mise à jour"
         },
         "view": {
             "close": "Fermer",
diff --git a/frontend/app/src/i18n/hi.json b/frontend/app/src/i18n/hi.json
index 319c6fb3e2..707d854d27 100644
--- a/frontend/app/src/i18n/hi.json
+++ b/frontend/app/src/i18n/hi.json
@@ -150,9 +150,11 @@
     "blockUserSucceeded": "उपयोगकर्ता को ब्लॉक कर दिया गया है",
     "bots": {
         "add": {
+            "action": "पंजीकरण करवाना",
             "addBot": "बॉट जोड़ें",
             "choosePermissions": "अनुमतियां",
             "failure": "खेद है कि हम बॉट को जोड़ने में असमर्थ रहे",
+            "loadDefinition": "लोड परिभाषा",
             "noPermissions": "किसी विशेष अनुमति की आवश्यकता नहीं",
             "permissionsInfo": "यह बॉट निम्नलिखित अनुमतियाँ चाहता है। दी गई अनुमतियों को सीमित करने का चयन करने से उपलब्ध कमांड सीमित हो जाएँगे।",
             "title": "बॉट को समुदाय में जोड़ें"
@@ -173,6 +175,7 @@
             "commandNamePlaceholder": "कमांड का नाम दर्ज करें",
             "commandPermissionsDesc": "इस आदेश के लिए आवश्यक अनुमतियों का वर्णन करें",
             "commandPermissionsLabel": "कमांड अनुमतियाँ",
+            "commandsLabel": "आदेश",
             "descLabel": "बॉट विवरण",
             "descPlaceholder": "बॉट विवरण दर्ज करें",
             "endpointLabel": "बॉट एंडपॉइंट",
@@ -187,6 +190,7 @@
                 "minLength": "कम से कम {n} अक्षर होने चाहिए",
                 "nameCheckError": "बॉट नाम की जाँच करते समय एक त्रुटि हुई",
                 "noCommands": "बॉट में कम से कम एक कमांड अवश्य होना चाहिए",
+                "owner": "आपको बॉट के लिए एक स्वामी दर्ज करना होगा",
                 "principal": "बॉट की पहचान करने के लिए आपको एक वैध प्रिंसिपल दर्ज करना होगा"
             },
             "iconLabel": "बॉट आइकन",
@@ -202,6 +206,8 @@
             "namePlaceholder": "बॉट का नाम दर्ज करें",
             "nameRules": "अद्वितीय होना चाहिए और इसमें केवल अल्फ़ान्यूमेरिक अक्षर और अंडरस्कोर ही होने चाहिए",
             "optional": "वैकल्पिक",
+            "ownerLabel": "बॉट मालिक",
+            "ownerRules": "इस बॉट का संपर्क बिंदु कौन है",
             "paramDescLabel": "पैरामीटर विवरण",
             "paramDescPlaceholder": "पैरामीटर विवरण दर्ज करें",
             "paramLabel": "पैराम: {name}",
@@ -209,6 +215,7 @@
             "paramNamePlaceholder": "पैरामीटर नाम दर्ज करें",
             "paramPlaceholderLabel": "पैरामीटर प्लेसहोल्डर",
             "paramPlaceholderPlaceholder": "पैरामीटर प्लेसहोल्डर दर्ज करें",
+            "paramsLabel": "पैरामीटर",
             "paramTypeLabel": "पैराम प्रकार",
             "permSameAsMessage": "संदेश अनुमतियों के समान",
             "permScopeChat": "बात करना",
@@ -325,7 +332,11 @@
             }
         },
         "update_bot": {
-            "desc": "मौजूदा OpenChat बॉट को अपडेट करने के लिए प्रस्ताव शुरू करें"
+            "action": "अद्यतन",
+            "desc": "मौजूदा OpenChat बॉट को अपडेट करने के लिए प्रस्ताव शुरू करें",
+            "nobots": "केवल पंजीकृत बॉट का स्वामी ही बॉट को अपडेट कर सकता है। आप किसी भी पंजीकृत बॉट के स्वामी नहीं हैं।",
+            "select": "उस बॉट का चयन करें जिसे आप अपडेट करना चाहते हैं.",
+            "title": "बॉट अपडेट करें"
         },
         "view": {
             "close": "बंद करना",
diff --git a/frontend/app/src/i18n/it.json b/frontend/app/src/i18n/it.json
index 00e6187a40..e02dbe881b 100644
--- a/frontend/app/src/i18n/it.json
+++ b/frontend/app/src/i18n/it.json
@@ -150,9 +150,11 @@
     "blockUserSucceeded": "L'utente è stato bloccato",
     "bots": {
         "add": {
+            "action": "Registro",
             "addBot": "Aggiungi bot",
             "choosePermissions": "Permessi",
             "failure": "Spiacenti, non siamo riusciti ad aggiungere il bot",
+            "loadDefinition": "Definizione del carico",
             "noPermissions": "Non sono richieste autorizzazioni speciali",
             "permissionsInfo": "Questo bot richiede i seguenti permessi. Scegliendo di limitare i permessi concessi si limiteranno i comandi disponibili.",
             "title": "Aggiungi bot alla community"
@@ -173,6 +175,7 @@
             "commandNamePlaceholder": "Inserisci il nome del comando",
             "commandPermissionsDesc": "Descrivi i permessi richiesti da questo comando",
             "commandPermissionsLabel": "Permessi di comando",
+            "commandsLabel": "Comandi",
             "descLabel": "Descrizione del bot",
             "descPlaceholder": "Inserisci la descrizione del bot",
             "endpointLabel": "Punto finale del bot",
@@ -187,6 +190,7 @@
                 "minLength": "Deve contenere almeno {n} caratteri",
                 "nameCheckError": "Si è verificato un errore durante il controllo del nome del bot",
                 "noCommands": "Un bot deve contenere almeno un comando",
+                "owner": "Devi inserire un proprietario per il bot",
                 "principal": "Devi inserire un'entità valida per identificare il bot"
             },
             "iconLabel": "Icona del bot",
@@ -202,6 +206,8 @@
             "namePlaceholder": "Inserisci il nome del bot",
             "nameRules": "Deve essere univoco e contenere solo caratteri alfanumerici e caratteri di sottolineatura",
             "optional": "opzionale",
+            "ownerLabel": "Proprietario del bot",
+            "ownerRules": "Chi è il punto di contatto per questo bot?",
             "paramDescLabel": "Descrizione del parametro",
             "paramDescPlaceholder": "Inserisci la descrizione del parametro",
             "paramLabel": "Parametro: {name}",
@@ -209,6 +215,7 @@
             "paramNamePlaceholder": "Inserisci il nome del parametro",
             "paramPlaceholderLabel": "Parametro segnaposto",
             "paramPlaceholderPlaceholder": "Inserisci segnaposto parametro",
+            "paramsLabel": "Parametri",
             "paramTypeLabel": "Tipo di parametro",
             "permSameAsMessage": "Uguali alle autorizzazioni dei messaggi",
             "permScopeChat": "Chiacchierata",
@@ -325,7 +332,11 @@
             }
         },
         "update_bot": {
-            "desc": "Avvia una proposta per aggiornare un bot OpenChat esistente"
+            "action": "Aggiornamento",
+            "desc": "Avvia una proposta per aggiornare un bot OpenChat esistente",
+            "nobots": "Solo il proprietario di un bot registrato può aggiornare il bot. Non sei il proprietario di alcun bot registrato.",
+            "select": "Seleziona il bot che desideri aggiornare.",
+            "title": "Aggiorna bot"
         },
         "view": {
             "close": "Vicino",
diff --git a/frontend/app/src/i18n/iw.json b/frontend/app/src/i18n/iw.json
index 1c1a8f322e..e01d037237 100644
--- a/frontend/app/src/i18n/iw.json
+++ b/frontend/app/src/i18n/iw.json
@@ -150,9 +150,11 @@
     "blockUserSucceeded": "המשתמש נחסם",
     "bots": {
         "add": {
+            "action": "לִרְשׁוֹם",
             "addBot": "הוסף בוט",
             "choosePermissions": "הרשאות",
             "failure": "מצטערים שלא הצלחנו להוסיף את הבוט",
+            "loadDefinition": "הגדרת עומס",
             "noPermissions": "אין צורך בהרשאות מיוחדות",
             "permissionsInfo": "הבוט הזה מחפש את ההרשאות הבאות. בחירה להגביל את ההרשאות שניתנו תגביל את הפקודות הזמינות.",
             "title": "הוסף בוט לקהילה"
@@ -173,6 +175,7 @@
             "commandNamePlaceholder": "הזן את שם הפקודה",
             "commandPermissionsDesc": "תאר את ההרשאות שפקודה זו דורשת",
             "commandPermissionsLabel": "הרשאות פקודה",
+            "commandsLabel": "פקודות",
             "descLabel": "תיאור הבוט",
             "descPlaceholder": "הזן את תיאור הבוט",
             "endpointLabel": "נקודת קצה של בוט",
@@ -187,6 +190,7 @@
                 "minLength": "חייב לכלול לפחות {n} תווים",
                 "nameCheckError": "אירעה שגיאה בבדיקת שם הבוט",
                 "noCommands": "בוט חייב להכיל לפחות פקודה אחת",
+                "owner": "עליך להזין בעלים עבור הבוט",
                 "principal": "עליך להזין מנהל תקף כדי לזהות את הבוט"
             },
             "iconLabel": "סמל בוט",
@@ -202,6 +206,8 @@
             "namePlaceholder": "הזן את שם הבוט",
             "nameRules": "חייב להיות ייחודי ולהכיל תווים אלפאנומריים וקווים תחתונים בלבד",
             "optional": "אופציונלי",
+            "ownerLabel": "בעל בוט",
+            "ownerRules": "מיהו נקודת המגע של הבוט הזה",
             "paramDescLabel": "תיאור פרמטר",
             "paramDescPlaceholder": "הזן תיאור פרמטר",
             "paramLabel": "פראם: {name}",
@@ -209,6 +215,7 @@
             "paramNamePlaceholder": "הזן את שם הפרמטר",
             "paramPlaceholderLabel": "מציין מיקום של פרמטר",
             "paramPlaceholderPlaceholder": "הזן מציין מיקום של פרמטר",
+            "paramsLabel": "פרמטרים",
             "paramTypeLabel": "סוג פארם",
             "permSameAsMessage": "זהה להרשאות הודעות",
             "permScopeChat": "לְשׂוֹחֵחַ",
@@ -325,7 +332,11 @@
             }
         },
         "update_bot": {
-            "desc": "התחל הצעה לעדכון בוט OpenChat קיים"
+            "action": "לְעַדְכֵּן",
+            "desc": "התחל הצעה לעדכון בוט OpenChat קיים",
+            "nobots": "רק הבעלים של בוט רשום יכול לעדכן את הבוט. אינך הבעלים של בוטים רשומים כלשהם.",
+            "select": "בחר את הבוט שברצונך לעדכן.",
+            "title": "עדכן את הבוט"
         },
         "view": {
             "close": "לִסְגוֹר",
diff --git a/frontend/app/src/i18n/jp.json b/frontend/app/src/i18n/jp.json
index 1d6ed661be..9380e739de 100644
--- a/frontend/app/src/i18n/jp.json
+++ b/frontend/app/src/i18n/jp.json
@@ -150,9 +150,11 @@
     "blockUserSucceeded": "ユーザーはブロックされました",
     "bots": {
         "add": {
+            "action": "登録する",
             "addBot": "ボットを追加",
             "choosePermissions": "権限",
             "failure": "申し訳ありませんが、ボットを追加できませんでした",
+            "loadDefinition": "荷重定義",
             "noPermissions": "特別な許可は必要ありません",
             "permissionsInfo": "このボットは以下の権限を要求します。付与される権限を制限することを選択すると、使用可能なコマンドが制限されます。",
             "title": "コミュニティにボットを追加する"
@@ -173,6 +175,7 @@
             "commandNamePlaceholder": "コマンド名を入力",
             "commandPermissionsDesc": "このコマンドに必要な権限について説明します",
             "commandPermissionsLabel": "コマンド権限",
+            "commandsLabel": "コマンド",
             "descLabel": "ボットの説明",
             "descPlaceholder": "ボットの説明を入力してください",
             "endpointLabel": "ボットエンドポイント",
@@ -187,6 +190,7 @@
                 "minLength": "少なくとも {n} 文字が必要です",
                 "nameCheckError": "ボット名の確認中にエラーが発生しました",
                 "noCommands": "ボットには少なくとも1つのコマンドが含まれている必要があります",
+                "owner": "ボットの所有者を入力する必要があります",
                 "principal": "ボットを識別するには有効なプリンシパルを入力する必要があります"
             },
             "iconLabel": "ボットアイコン",
@@ -202,6 +206,8 @@
             "namePlaceholder": "ボット名を入力",
             "nameRules": "一意であり、英数字とアンダースコアのみを含む必要があります",
             "optional": "オプション",
+            "ownerLabel": "ボット所有者",
+            "ownerRules": "このボットの連絡先は誰ですか",
             "paramDescLabel": "パラメータの説明",
             "paramDescPlaceholder": "パラメータの説明を入力してください",
             "paramLabel": "パラメータ: {name}",
@@ -209,6 +215,7 @@
             "paramNamePlaceholder": "パラメータ名を入力してください",
             "paramPlaceholderLabel": "パラメータプレースホルダ",
             "paramPlaceholderPlaceholder": "パラメータプレースホルダを入力",
+            "paramsLabel": "パラメータ",
             "paramTypeLabel": "パラメータタイプ",
             "permSameAsMessage": "メッセージの権限と同じ",
             "permScopeChat": "チャット",
@@ -325,7 +332,11 @@
             }
         },
         "update_bot": {
-            "desc": "既存のOpenChatボットを更新する提案を開始する"
+            "action": "アップデート",
+            "desc": "既存のOpenChatボットを更新する提案を開始する",
+            "nobots": "登録されたボットの所有者のみがボットを更新できます。あなたは登録されたボットの所有者ではありません。",
+            "select": "更新するボットを選択します。",
+            "title": "ボットの更新"
         },
         "view": {
             "close": "近い",
diff --git a/frontend/app/src/i18n/pl.json b/frontend/app/src/i18n/pl.json
index 9cd25a193c..fa7d185dcf 100644
--- a/frontend/app/src/i18n/pl.json
+++ b/frontend/app/src/i18n/pl.json
@@ -150,9 +150,11 @@
     "blockUserSucceeded": "Użytkownik został zablokowany",
     "bots": {
         "add": {
+            "action": "Rejestr",
             "addBot": "Dodaj bota",
             "choosePermissions": "Uprawnienia",
             "failure": "Przepraszamy, nie udało nam się dodać bota",
+            "loadDefinition": "Definicja obciążenia",
             "noPermissions": "Nie są wymagane żadne specjalne uprawnienia",
             "permissionsInfo": "Ten bot szuka następujących uprawnień. Wybór ograniczenia przyznanych uprawnień ograniczy dostępne polecenia.",
             "title": "Dodaj bota do społeczności"
@@ -173,6 +175,7 @@
             "commandNamePlaceholder": "Wprowadź nazwę polecenia",
             "commandPermissionsDesc": "Opisz uprawnienia, których wymaga to polecenie",
             "commandPermissionsLabel": "Uprawnienia do poleceń",
+            "commandsLabel": "Polecenia",
             "descLabel": "Opis bota",
             "descPlaceholder": "Wprowadź opis bota",
             "endpointLabel": "Punkt końcowy bota",
@@ -187,6 +190,7 @@
                 "minLength": "Musi mieć co najmniej {n} znaków",
                 "nameCheckError": "Wystąpił błąd podczas sprawdzania nazwy bota",
                 "noCommands": "Bot musi zawierać co najmniej jedno polecenie",
+                "owner": "Musisz podać właściciela bota",
                 "principal": "Aby zidentyfikować bota, należy wprowadzić prawidłowy podmiot"
             },
             "iconLabel": "Ikona bota",
@@ -202,6 +206,8 @@
             "namePlaceholder": "Wprowadź nazwę bota",
             "nameRules": "Musi być unikalny i zawierać wyłącznie znaki alfanumeryczne oraz podkreślenia",
             "optional": "fakultatywny",
+            "ownerLabel": "Właściciel bota",
+            "ownerRules": "Kto jest osobą kontaktową dla tego bota",
             "paramDescLabel": "Opis parametrów",
             "paramDescPlaceholder": "Wprowadź opis parametru",
             "paramLabel": "Parametr: {name}",
@@ -209,6 +215,7 @@
             "paramNamePlaceholder": "Wprowadź nazwę parametru",
             "paramPlaceholderLabel": "Symbol zastępczy parametru",
             "paramPlaceholderPlaceholder": "Wprowadź symbol zastępczy parametru",
+            "paramsLabel": "Parametry",
             "paramTypeLabel": "Typ parametru",
             "permSameAsMessage": "Tak samo jak uprawnienia do wiadomości",
             "permScopeChat": "Pogawędzić",
@@ -325,7 +332,11 @@
             }
         },
         "update_bot": {
-            "desc": "Rozpocznij propozycję aktualizacji istniejącego bota OpenChat"
+            "action": "Aktualizacja",
+            "desc": "Rozpocznij propozycję aktualizacji istniejącego bota OpenChat",
+            "nobots": "Tylko właściciel zarejestrowanego bota może aktualizować bota. Nie jesteś właścicielem żadnego zarejestrowanego bota.",
+            "select": "Wybierz bota, którego chcesz zaktualizować.",
+            "title": "Aktualizacja bota"
         },
         "view": {
             "close": "Zamknąć",
diff --git a/frontend/app/src/i18n/ru.json b/frontend/app/src/i18n/ru.json
index 709488f85e..4572fbce5d 100644
--- a/frontend/app/src/i18n/ru.json
+++ b/frontend/app/src/i18n/ru.json
@@ -150,9 +150,11 @@
     "blockUserSucceeded": "Пользователь заблокирован",
     "bots": {
         "add": {
+            "action": "Зарегистрироваться",
             "addBot": "Добавить бота",
             "choosePermissions": "Разрешения",
             "failure": "Извините, мы не смогли добавить бота.",
+            "loadDefinition": "Определение нагрузки",
             "noPermissions": "Никаких специальных разрешений не требуется.",
             "permissionsInfo": "Этот бот запрашивает следующие разрешения. Выбор ограничения предоставленных разрешений ограничит доступные команды.",
             "title": "Добавить бота в сообщество"
@@ -173,6 +175,7 @@
             "commandNamePlaceholder": "Введите имя команды",
             "commandPermissionsDesc": "Опишите разрешения, необходимые этой команде.",
             "commandPermissionsLabel": "Разрешения на выполнение команд",
+            "commandsLabel": "Команды",
             "descLabel": "Описание бота",
             "descPlaceholder": "Введите описание бота",
             "endpointLabel": "Конечная точка бота",
@@ -187,6 +190,7 @@
                 "minLength": "Должно быть не менее {n} символов",
                 "nameCheckError": "Произошла ошибка при проверке имени бота",
                 "noCommands": "Бот должен содержать хотя бы одну команду",
+                "owner": "Вам необходимо ввести владельца бота.",
                 "principal": "Вам необходимо ввести действительного принципала для идентификации бота."
             },
             "iconLabel": "Значок бота",
@@ -202,6 +206,8 @@
             "namePlaceholder": "Введите имя бота",
             "nameRules": "Должен быть уникальным и содержать только буквенно-цифровые символы и символы подчеркивания.",
             "optional": "необязательный",
+            "ownerLabel": "Владелец бота",
+            "ownerRules": "Кто является контактным лицом для этого бота?",
             "paramDescLabel": "Описание параметра",
             "paramDescPlaceholder": "Введите описание параметра",
             "paramLabel": "Параметр: {name}",
@@ -209,6 +215,7 @@
             "paramNamePlaceholder": "Введите имя параметра",
             "paramPlaceholderLabel": "Заполнитель параметра",
             "paramPlaceholderPlaceholder": "Введите заполнитель параметра",
+            "paramsLabel": "Параметры",
             "paramTypeLabel": "Тип параметра",
             "permSameAsMessage": "То же, что и разрешения на сообщения",
             "permScopeChat": "Чат",
@@ -325,7 +332,11 @@
             }
         },
         "update_bot": {
-            "desc": "Начать предложение по обновлению существующего бота OpenChat"
+            "action": "Обновлять",
+            "desc": "Начать предложение по обновлению существующего бота OpenChat",
+            "nobots": "Только владелец зарегистрированного бота может обновить бота. Вы не являетесь владельцем ни одного зарегистрированного бота.",
+            "select": "Выберите бота, которого вы хотите обновить.",
+            "title": "Обновление бота"
         },
         "view": {
             "close": "Закрывать",
diff --git a/frontend/app/src/i18n/uk.json b/frontend/app/src/i18n/uk.json
index 6c560e38f1..fe0619b5ee 100644
--- a/frontend/app/src/i18n/uk.json
+++ b/frontend/app/src/i18n/uk.json
@@ -150,9 +150,11 @@
     "blockUserSucceeded": "Користувача заблоковано",
     "bots": {
         "add": {
+            "action": "зареєструватися",
             "addBot": "Додати бота",
             "choosePermissions": "Дозволи",
             "failure": "На жаль, ми не змогли додати бота",
+            "loadDefinition": "Визначення навантаження",
             "noPermissions": "Спеціальні дозволи не потрібні",
             "permissionsInfo": "Цей бот шукає такі дозволи. Вибір обмеження наданих дозволів обмежить доступні команди.",
             "title": "Додати бота до спільноти"
@@ -173,6 +175,7 @@
             "commandNamePlaceholder": "Введіть назву команди",
             "commandPermissionsDesc": "Опишіть дозволи, які вимагає ця команда",
             "commandPermissionsLabel": "Дозволи команди",
+            "commandsLabel": "Команди",
             "descLabel": "Опис бота",
             "descPlaceholder": "Введіть опис бота",
             "endpointLabel": "Кінцева точка бота",
@@ -187,6 +190,7 @@
                 "minLength": "Має бути принаймні {n} символів",
                 "nameCheckError": "Під час перевірки імені бота сталася помилка",
                 "noCommands": "Бот повинен містити хоча б одну команду",
+                "owner": "Ви повинні ввести власника для бота",
                 "principal": "Ви повинні ввести дійсний принципал, щоб ідентифікувати бота"
             },
             "iconLabel": "Значок бота",
@@ -202,6 +206,8 @@
             "namePlaceholder": "Введіть назву бота",
             "nameRules": "Має бути унікальним і містити лише буквено-цифрові символи та підкреслення",
             "optional": "необов'язковий",
+            "ownerLabel": "Власник бота",
+            "ownerRules": "Хто контактний для цього бота",
             "paramDescLabel": "Опис параметра",
             "paramDescPlaceholder": "Введіть опис параметра",
             "paramLabel": "Параметр: {name}",
@@ -209,6 +215,7 @@
             "paramNamePlaceholder": "Введіть назву параметра",
             "paramPlaceholderLabel": "Заповнювач параметра",
             "paramPlaceholderPlaceholder": "Введіть заповнювач параметра",
+            "paramsLabel": "Параметри",
             "paramTypeLabel": "Тип параметра",
             "permSameAsMessage": "Те саме, що дозволи на повідомлення",
             "permScopeChat": "Чат",
@@ -325,7 +332,11 @@
             }
         },
         "update_bot": {
-            "desc": "Розпочніть пропозицію щодо оновлення існуючого бота OpenChat"
+            "action": "оновлення",
+            "desc": "Розпочніть пропозицію щодо оновлення існуючого бота OpenChat",
+            "nobots": "Оновити бота може лише власник зареєстрованого бота. Ви не є власником жодного зареєстрованого бота.",
+            "select": "Виберіть бота, якого ви хочете оновити.",
+            "title": "Оновлення бота"
         },
         "view": {
             "close": "Закрити",
diff --git a/frontend/app/src/i18n/vi.json b/frontend/app/src/i18n/vi.json
index 4b3429c8be..a33beb0bf3 100644
--- a/frontend/app/src/i18n/vi.json
+++ b/frontend/app/src/i18n/vi.json
@@ -150,9 +150,11 @@
     "blockUserSucceeded": "Người dùng đã bị chặn",
     "bots": {
         "add": {
+            "action": "Đăng ký",
             "addBot": "Thêm bot",
             "choosePermissions": "Quyền",
             "failure": "Xin lỗi chúng tôi không thể thêm bot",
+            "loadDefinition": "Tải định nghĩa",
             "noPermissions": "Không cần quyền đặc biệt",
             "permissionsInfo": "Bot này tìm kiếm các quyền sau. Việc chọn giới hạn các quyền được cấp sẽ giới hạn các lệnh khả dụng.",
             "title": "Thêm bot vào cộng đồng"
@@ -173,6 +175,7 @@
             "commandNamePlaceholder": "Nhập tên lệnh",
             "commandPermissionsDesc": "Mô tả các quyền mà lệnh này yêu cầu",
             "commandPermissionsLabel": "Quyền lệnh",
+            "commandsLabel": "Lệnh",
             "descLabel": "Mô tả bot",
             "descPlaceholder": "Nhập mô tả bot",
             "endpointLabel": "Điểm cuối của Bot",
@@ -187,6 +190,7 @@
                 "minLength": "Phải có ít nhất {n} ký tự",
                 "nameCheckError": "Đã xảy ra lỗi khi kiểm tra tên bot",
                 "noCommands": "Một bot phải chứa ít nhất một lệnh",
+                "owner": "Bạn phải nhập chủ sở hữu cho bot",
                 "principal": "Bạn phải nhập một nguyên tắc hợp lệ để xác định bot"
             },
             "iconLabel": "Biểu tượng bot",
@@ -202,6 +206,8 @@
             "namePlaceholder": "Nhập tên bot",
             "nameRules": "Phải là duy nhất và chỉ chứa các ký tự chữ và số và dấu gạch dưới",
             "optional": "không bắt buộc",
+            "ownerLabel": "Chủ sở hữu bot",
+            "ownerRules": "Ai là người liên hệ cho bot này",
             "paramDescLabel": "Mô tả tham số",
             "paramDescPlaceholder": "Nhập mô tả tham số",
             "paramLabel": "Tham số: {name}",
@@ -209,6 +215,7 @@
             "paramNamePlaceholder": "Nhập tên tham số",
             "paramPlaceholderLabel": "Trình giữ chỗ tham số",
             "paramPlaceholderPlaceholder": "Nhập tham số giữ chỗ",
+            "paramsLabel": "Các tham số",
             "paramTypeLabel": "Kiểu tham số",
             "permSameAsMessage": "Giống như quyền tin nhắn",
             "permScopeChat": "Trò chuyện",
@@ -325,7 +332,11 @@
             }
         },
         "update_bot": {
-            "desc": "Bắt đầu đề xuất cập nhật bot OpenChat hiện có"
+            "action": "Cập nhật",
+            "desc": "Bắt đầu đề xuất cập nhật bot OpenChat hiện có",
+            "nobots": "Chỉ có chủ sở hữu của bot đã đăng ký mới có thể cập nhật bot. Bạn không phải là chủ sở hữu của bất kỳ bot đã đăng ký nào.",
+            "select": "Chọn bot mà bạn muốn cập nhật.",
+            "title": "Cập nhật bot"
         },
         "view": {
             "close": "Đóng",
diff --git a/frontend/openchat-agent/src/services/community/community.client.ts b/frontend/openchat-agent/src/services/community/community.client.ts
index 4d0f1fbac4..de36c2441d 100644
--- a/frontend/openchat-agent/src/services/community/community.client.ts
+++ b/frontend/openchat-agent/src/services/community/community.client.ts
@@ -1740,7 +1740,10 @@ export class CommunityClient extends CandidService {
         );
     }
 
-    updateBot(botId: string, grantedPermissions: SlashCommandPermissions): Promise<boolean> {
+    updateInstalledBot(
+        botId: string,
+        grantedPermissions: SlashCommandPermissions,
+    ): Promise<boolean> {
         return this.executeMsgpackUpdate(
             "update_bot",
             {
@@ -1757,7 +1760,7 @@ export class CommunityClient extends CandidService {
         );
     }
 
-    removeBot(botId: string): Promise<boolean> {
+    removeInstalledBot(botId: string): Promise<boolean> {
         return this.executeMsgpackUpdate(
             "remove_bot",
             {
diff --git a/frontend/openchat-agent/src/services/externalBot/externalBot.ts b/frontend/openchat-agent/src/services/externalBot/externalBot.ts
index 1d87e629a0..9e38a7accd 100644
--- a/frontend/openchat-agent/src/services/externalBot/externalBot.ts
+++ b/frontend/openchat-agent/src/services/externalBot/externalBot.ts
@@ -11,7 +11,7 @@ const ApiBotDefinition = Type.Object({
 });
 
 export function getBotDefinition(endpoint: string): Promise<BotDefinitionResponse> {
-    return fetch(`${endpoint}/schema`)
+    return fetch(`${endpoint}`)
         .then((res) => {
             if (res.ok) {
                 return res.json();
@@ -30,6 +30,7 @@ export function getBotDefinition(endpoint: string): Promise<BotDefinitionRespons
 
 function validateSchema(json: unknown): BotDefinitionResponse {
     try {
+        console.log("Bot definition", json);
         const value = Value.Parse(ApiBotDefinition, json);
         return externalBotDefinition(value);
     } catch (err) {
diff --git a/frontend/openchat-agent/src/services/group/group.client.ts b/frontend/openchat-agent/src/services/group/group.client.ts
index 35aac0f817..abc5866e37 100644
--- a/frontend/openchat-agent/src/services/group/group.client.ts
+++ b/frontend/openchat-agent/src/services/group/group.client.ts
@@ -1308,7 +1308,10 @@ export class GroupClient extends CandidService {
         );
     }
 
-    updateBot(botId: string, grantedPermissions: SlashCommandPermissions): Promise<boolean> {
+    updateInstalledBot(
+        botId: string,
+        grantedPermissions: SlashCommandPermissions,
+    ): Promise<boolean> {
         return this.executeMsgpackUpdate(
             "update_bot",
             {
@@ -1325,7 +1328,7 @@ export class GroupClient extends CandidService {
         );
     }
 
-    removeBot(botId: string): Promise<boolean> {
+    removeInstalledBot(botId: string): Promise<boolean> {
         return this.executeMsgpackUpdate(
             "remove_bot",
             {
diff --git a/frontend/openchat-agent/src/services/openchatAgent.ts b/frontend/openchat-agent/src/services/openchatAgent.ts
index ecab0ef0cb..02f9bc8481 100644
--- a/frontend/openchat-agent/src/services/openchatAgent.ts
+++ b/frontend/openchat-agent/src/services/openchatAgent.ts
@@ -3989,9 +3989,9 @@ export class OpenChatAgent extends EventTarget {
         ];
     }
 
-    deleteUser(userId: string): Promise<boolean> {
-        return this._userIndexClient.deleteUser(userId);
-    }
+    // deleteUser(userId: string): Promise<boolean> {
+    //     return this._userIndexClient.deleteUser(userId);
+    // }
 
     getChannelSummary(channelId: ChannelIdentifier): Promise<ChannelSummaryResponse> {
         return this.communityClient(channelId.communityId)
@@ -4019,6 +4019,17 @@ export class OpenChatAgent extends EventTarget {
         return this._userIndexClient.registerBot(bot);
     }
 
+    updateRegisteredBot(
+        id: string,
+        ownerId?: string,
+        name?: string,
+        avatarUrl?: string,
+        endpoint?: string,
+    ): Promise<boolean> {
+        if (offline()) return Promise.resolve(false);
+        return this._userIndexClient.updateRegisteredBot(id, ownerId, name, avatarUrl, endpoint);
+    }
+
     addBot(
         id: CommunityIdentifier | GroupChatIdentifier,
         botId: string,
@@ -4032,25 +4043,34 @@ export class OpenChatAgent extends EventTarget {
         }
     }
 
-    updateBot(
+    updateInstalledBot(
         id: CommunityIdentifier | GroupChatIdentifier,
         botId: string,
         grantedPermissions: SlashCommandPermissions,
     ): Promise<boolean> {
         switch (id.kind) {
             case "community":
-                return this.communityClient(id.communityId).updateBot(botId, grantedPermissions);
+                return this.communityClient(id.communityId).updateInstalledBot(
+                    botId,
+                    grantedPermissions,
+                );
             case "group_chat":
-                return this.getGroupClient(id.groupId).updateBot(botId, grantedPermissions);
+                return this.getGroupClient(id.groupId).updateInstalledBot(
+                    botId,
+                    grantedPermissions,
+                );
         }
     }
 
-    removeBot(id: CommunityIdentifier | GroupChatIdentifier, botId: string): Promise<boolean> {
+    removeInstalledBot(
+        id: CommunityIdentifier | GroupChatIdentifier,
+        botId: string,
+    ): Promise<boolean> {
         switch (id.kind) {
             case "community":
-                return this.communityClient(id.communityId).removeBot(botId);
+                return this.communityClient(id.communityId).removeInstalledBot(botId);
             case "group_chat":
-                return this.getGroupClient(id.groupId).removeBot(botId);
+                return this.getGroupClient(id.groupId).removeInstalledBot(botId);
         }
     }
 
diff --git a/frontend/openchat-agent/src/services/userIndex/userIndex.client.ts b/frontend/openchat-agent/src/services/userIndex/userIndex.client.ts
index a33bf6107a..914795a456 100644
--- a/frontend/openchat-agent/src/services/userIndex/userIndex.client.ts
+++ b/frontend/openchat-agent/src/services/userIndex/userIndex.client.ts
@@ -82,8 +82,8 @@ import {
     UserIndexCheckUsernameResponse,
     UserIndexChitLeaderboardResponse,
     UserIndexCurrentUserResponse,
-    UserIndexDeleteUserArgs,
-    UserIndexDeleteUserResponse,
+    // UserIndexDeleteUserArgs,
+    // UserIndexDeleteUserResponse,
     UserIndexDiamondMembershipFeesResponse,
     UserIndexExploreBotsArgs,
     UserIndexExploreBotsResponse,
@@ -114,6 +114,8 @@ import {
     UserIndexSuspendUserResponse,
     UserIndexUnsuspendUserArgs,
     UserIndexUnsuspendUserResponse,
+    UserIndexUpdateBotArgs,
+    UserIndexUpdateBotResponse,
     UserIndexUserRegistrationCanisterResponse,
     UserIndexUsersArgs,
     UserIndexUsersResponse,
@@ -604,15 +606,15 @@ export class UserIndexClient extends CandidService {
         );
     }
 
-    deleteUser(userId: string): Promise<boolean> {
-        return this.executeMsgpackUpdate(
-            "delete_user",
-            { user_id: principalStringToBytes(userId) },
-            (resp) => resp === "Success",
-            UserIndexDeleteUserArgs,
-            UserIndexDeleteUserResponse,
-        );
-    }
+    // deleteUser(userId: string): Promise<boolean> {
+    //     return this.executeMsgpackUpdate(
+    //         "delete_user",
+    //         { user_id: principalStringToBytes(userId) },
+    //         (resp) => resp === "Success",
+    //         UserIndexDeleteUserArgs,
+    //         UserIndexDeleteUserResponse,
+    //     );
+    // }
 
     exploreBots(
         searchTerm: string | undefined,
@@ -654,6 +656,34 @@ export class UserIndexClient extends CandidService {
         );
     }
 
+    updateRegisteredBot(
+        id: string,
+        ownerId?: string,
+        name?: string,
+        avatarUrl?: string,
+        endpoint?: string,
+    ): Promise<boolean> {
+        return this.executeMsgpackUpdate(
+            "update_bot",
+            {
+                bot_id: principalStringToBytes(id),
+                owner: mapOptional(ownerId, principalStringToBytes),
+                name: mapOptional(name, identity),
+                avatar:
+                    mapOptional(avatarUrl, (url) => ({
+                        SetToSome: url,
+                    })) ?? "NoChange",
+                endpoint: mapOptional(endpoint, identity),
+            },
+            (resp) => {
+                console.log("UserIndex update bot response: ", resp);
+                return true;
+            },
+            UserIndexUpdateBotArgs,
+            UserIndexUpdateBotResponse,
+        );
+    }
+
     getBots(current: BotsResponse | undefined): Promise<BotsResponse> {
         return this.executeMsgpackQuery(
             "bot_updates",
diff --git a/frontend/openchat-agent/src/typebox.ts b/frontend/openchat-agent/src/typebox.ts
index d527c9c946..e18dfc49d6 100644
--- a/frontend/openchat-agent/src/typebox.ts
+++ b/frontend/openchat-agent/src/typebox.ts
@@ -2149,13 +2149,6 @@ export const UserIndexSearchArgs = Type.Object({
     max_results: Type.Number(),
 });
 
-export type UserIndexDeleteUserResponse = Static<typeof UserIndexDeleteUserResponse>;
-export const UserIndexDeleteUserResponse = Type.Union([
-    Type.Literal("Success"),
-    Type.Literal("NotAuthorized"),
-    Type.Literal("UserNotFound"),
-]);
-
 export type UserIndexUnsuspendUserResponse = Static<typeof UserIndexUnsuspendUserResponse>;
 export const UserIndexUnsuspendUserResponse = Type.Union([
     Type.Literal("Success"),
@@ -2211,6 +2204,26 @@ export const UserIndexSetUsernameArgs = Type.Object({
     username: Type.String(),
 });
 
+export type UserIndexUpdateBotResponse = Static<typeof UserIndexUpdateBotResponse>;
+export const UserIndexUpdateBotResponse = Type.Union([
+    Type.Literal("Success"),
+    Type.Literal("NameInvalid"),
+    Type.Literal("NameAlreadyExists"),
+    Type.Literal("AvatarInvalid"),
+    Type.Literal("EndpointInvalid"),
+    Type.Literal("BotNotFound"),
+    Type.Literal("BotSuspended"),
+    Type.Literal("NotAuthorised"),
+    Type.Literal("OwnerNotFound"),
+    Type.Literal("OwnerSuspended"),
+    Type.Literal("NewOwnerNotFound"),
+    Type.Literal("NewOwnerSuspended"),
+    Type.Literal("DefinitionNotFound"),
+    Type.Literal("DefinitionInvalid"),
+    Type.Literal("DescriptionTooLong"),
+    Type.Literal("TooManyCommands"),
+]);
+
 export type UserIndexSetDisplayNameResponse = Static<typeof UserIndexSetDisplayNameResponse>;
 export const UserIndexSetDisplayNameResponse = Type.Union([
     Type.Literal("Success"),
@@ -4941,11 +4954,6 @@ export const UserIndexReferralMetricsResponse = Type.Object({
     Success: UserIndexReferralMetricsReferralMetrics,
 });
 
-export type UserIndexDeleteUserArgs = Static<typeof UserIndexDeleteUserArgs>;
-export const UserIndexDeleteUserArgs = Type.Object({
-    user_id: UserId,
-});
-
 export type UserIndexUnsuspendUserArgs = Static<typeof UserIndexUnsuspendUserArgs>;
 export const UserIndexUnsuspendUserArgs = Type.Object({
     user_id: UserId,
@@ -4972,6 +4980,15 @@ export const UserIndexChitLeaderboardChitUserBalance = Type.Object({
     balance: Type.Number(),
 });
 
+export type UserIndexUpdateBotArgs = Static<typeof UserIndexUpdateBotArgs>;
+export const UserIndexUpdateBotArgs = Type.Object({
+    bot_id: UserId,
+    owner: Type.Optional(Type.Union([UserId, Type.Undefined()])),
+    name: Type.Optional(Type.Union([Type.String(), Type.Undefined()])),
+    avatar: OptionUpdateString,
+    endpoint: Type.Optional(Type.Union([Type.String(), Type.Undefined()])),
+});
+
 export type UserIndexSetDiamondMembershipFeesArgs = Static<
     typeof UserIndexSetDiamondMembershipFeesArgs
 >;
diff --git a/frontend/openchat-client/src/openchat.ts b/frontend/openchat-client/src/openchat.ts
index 0c09f0ef6d..b111216363 100644
--- a/frontend/openchat-client/src/openchat.ts
+++ b/frontend/openchat-client/src/openchat.ts
@@ -4692,6 +4692,26 @@ export class OpenChat extends EventTarget {
         });
     }
 
+    updateRegisteredBot(
+        id: string,
+        ownerId?: string,
+        name?: string,
+        avatarUrl?: string,
+        endpoint?: string,
+    ): Promise<boolean> {
+        return this.#sendRequest({
+            kind: "updateRegisteredBot",
+            id,
+            ownerId,
+            name,
+            avatarUrl,
+            endpoint,
+        }).catch((err) => {
+            this.#logger.error("Failed to update registered bot: ", err);
+            return false;
+        });
+    }
+
     registerUser(username: string): Promise<RegisterUserResponse> {
         return this.#sendRequest({
             kind: "registerUser",
@@ -7744,7 +7764,6 @@ export class OpenChat extends EventTarget {
         return fetch(`${bot.endpoint}/execute_command`, {
             method: "POST",
             headers: headers,
-            body: token,
         }).then((res) => {
             if (res.ok) {
                 return res.json();
@@ -7869,13 +7888,13 @@ export class OpenChat extends EventTarget {
         });
     }
 
-    updateBot(
+    updateInstalledBot(
         id: CommunityIdentifier | GroupChatIdentifier,
         botId: string,
         grantedPermissions: SlashCommandPermissions,
     ): Promise<boolean> {
         return this.#sendRequest({
-            kind: "updateBot",
+            kind: "updateInstalledBot",
             id,
             botId,
             grantedPermissions,
@@ -7886,9 +7905,12 @@ export class OpenChat extends EventTarget {
     }
 
     // TODO - probably need to think about local updates here
-    removeBot(id: CommunityIdentifier | GroupChatIdentifier, botId: string): Promise<boolean> {
+    removeInstalledBot(
+        id: CommunityIdentifier | GroupChatIdentifier,
+        botId: string,
+    ): Promise<boolean> {
         return this.#sendRequest({
-            kind: "removeBot",
+            kind: "removeInstalledBot",
             id,
             botId,
         }).catch((err) => {
diff --git a/frontend/openchat-shared/src/domain/bots.ts b/frontend/openchat-shared/src/domain/bots.ts
index 2e5800883c..69532babab 100644
--- a/frontend/openchat-shared/src/domain/bots.ts
+++ b/frontend/openchat-shared/src/domain/bots.ts
@@ -175,21 +175,19 @@ export type SlashCommandInstance = {
 
 export type Bot = ExternalBot | InternalBot;
 
-export function emptyBotInstance(bot?: ExternalBot): ExternalBot {
-    return bot
-        ? structuredClone(bot)
-        : {
-              kind: "external_bot",
-              id: "",
-              ownerId: "",
-              name: "",
-              endpoint: "",
-              definition: {
-                  kind: "bot_definition",
-                  description: "",
-                  commands: [],
-              },
-          };
+export function emptyBotInstance(ownerId: string): ExternalBot {
+    return {
+        kind: "external_bot",
+        id: "",
+        ownerId,
+        name: "",
+        endpoint: "",
+        definition: {
+            kind: "bot_definition",
+            description: "",
+            commands: [],
+        },
+    };
 }
 
 type BotCommon = {
@@ -243,7 +241,7 @@ export type FlattenedCommand = SlashCommandSchema &
         | {
               kind: "external_bot";
               botName: string;
-              botIcon?: string;
+              avatarUrl?: string;
               botId: string;
               botEndpoint: string;
               botDescription?: string;
@@ -387,6 +385,10 @@ export function validateBot(bot: ExternalBot): ValidationErrors {
     const errors = new ValidationErrors();
     errors.addErrors(`bot_name`, validBotComponentName(bot.name));
 
+    if (bot.ownerId === "") {
+        errors.addErrors("bot_owner", i18nKey("bots.builder.errors.owner"));
+    }
+
     if (!validEndpoint(bot.endpoint)) {
         errors.addErrors("bot_endpoint", i18nKey("bots.builder.errors.endpoint"));
     }
diff --git a/frontend/openchat-shared/src/domain/worker.ts b/frontend/openchat-shared/src/domain/worker.ts
index 7dc38bd826..896dec3510 100644
--- a/frontend/openchat-shared/src/domain/worker.ts
+++ b/frontend/openchat-shared/src/domain/worker.ts
@@ -418,8 +418,9 @@ export type WorkerRequest =
     | MarkActivityFeedRead
     | DeleteUser
     | AddBot
-    | RemoveBot
-    | UpdateBot
+    | RemoveInstalledBot
+    | UpdateInstalledBot
+    | UpdateRegisteredBot
     | GetBotDefinition;
 
 type GetBotDefinition = {
@@ -427,6 +428,15 @@ type GetBotDefinition = {
     endpoint: string;
 };
 
+type UpdateRegisteredBot = {
+    kind: "updateRegisteredBot";
+    id: string;
+    ownerId?: string;
+    name?: string;
+    avatarUrl?: string;
+    endpoint?: string;
+};
+
 type AddBot = {
     kind: "addBot";
     id: CommunityIdentifier | GroupChatIdentifier;
@@ -434,15 +444,15 @@ type AddBot = {
     grantedPermissions: SlashCommandPermissions;
 };
 
-type UpdateBot = {
-    kind: "updateBot";
+type UpdateInstalledBot = {
+    kind: "updateInstalledBot";
     id: CommunityIdentifier | GroupChatIdentifier;
     botId: string;
     grantedPermissions: SlashCommandPermissions;
 };
 
-type RemoveBot = {
-    kind: "removeBot";
+type RemoveInstalledBot = {
+    kind: "removeInstalledBot";
     id: CommunityIdentifier | GroupChatIdentifier;
     botId: string;
 };
@@ -2002,6 +2012,8 @@ export type WorkerResult<T> = T extends Init
     ? ExploreBotsResponse
     : T extends RegisterBot
     ? boolean
+    : T extends UpdateRegisteredBot
+    ? boolean
     : T extends DismissRecommendations
     ? void
     : T extends GroupInvite
@@ -2272,8 +2284,8 @@ export type WorkerResult<T> = T extends Init
     ? boolean
     : T extends GetBotDefinition
     ? BotDefinitionResponse
-    : T extends RemoveBot
+    : T extends RemoveInstalledBot
     ? boolean
-    : T extends UpdateBot
+    : T extends UpdateInstalledBot
     ? boolean
     : never;
diff --git a/frontend/openchat-worker/src/worker.ts b/frontend/openchat-worker/src/worker.ts
index 5b79df7fb3..c1bf0450aa 100644
--- a/frontend/openchat-worker/src/worker.ts
+++ b/frontend/openchat-worker/src/worker.ts
@@ -803,6 +803,20 @@ self.addEventListener("message", (msg: MessageEvent<CorrelatedWorkerRequest>) =>
                 executeThenReply(payload, correlationId, agent.registerBot(payload.bot));
                 break;
 
+            case "updateRegisteredBot":
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.updateRegisteredBot(
+                        payload.id,
+                        payload.ownerId,
+                        payload.name,
+                        payload.avatarUrl,
+                        payload.endpoint,
+                    ),
+                );
+                break;
+
             case "searchGroups":
                 executeThenReply(
                     payload,
@@ -1868,9 +1882,9 @@ self.addEventListener("message", (msg: MessageEvent<CorrelatedWorkerRequest>) =>
                 );
                 break;
 
-            case "deleteUser":
-                executeThenReply(payload, correlationId, agent.deleteUser(payload.userId));
-                break;
+            // case "deleteUser":
+            //     executeThenReply(payload, correlationId, agent.deleteUser(payload.userId));
+            //     break;
 
             case "addBot":
                 executeThenReply(
@@ -1880,19 +1894,19 @@ self.addEventListener("message", (msg: MessageEvent<CorrelatedWorkerRequest>) =>
                 );
                 break;
 
-            case "updateBot":
+            case "updateInstalledBot":
                 executeThenReply(
                     payload,
                     correlationId,
-                    agent.updateBot(payload.id, payload.botId, payload.grantedPermissions),
+                    agent.updateInstalledBot(payload.id, payload.botId, payload.grantedPermissions),
                 );
                 break;
 
-            case "removeBot":
+            case "removeInstalledBot":
                 executeThenReply(
                     payload,
                     correlationId,
-                    agent.removeBot(payload.id, payload.botId),
+                    agent.removeInstalledBot(payload.id, payload.botId),
                 );
                 break;
 
diff --git a/tsBindings/types.d.ts b/tsBindings/types.d.ts
index 9d581a0f5e..a34d74f717 100644
--- a/tsBindings/types.d.ts
+++ b/tsBindings/types.d.ts
@@ -245,13 +245,13 @@ export type UserIndexPayForDiamondMembershipSuccessResult = { expires_at: bigint
 export type UserIndexPayForDiamondMembershipResponse = { "Success": UserIndexPayForDiamondMembershipSuccessResult } | "AlreadyLifetimeDiamondMember" | "CurrencyNotSupported" | "PriceMismatch" | "PaymentAlreadyInProgress" | "UserNotFound" | { "InsufficientFunds": bigint } | { "TransferFailed": string } | { "InternalError": string };
 export type UserIndexPayForDiamondMembershipArgs = { duration: DiamondMembershipPlanDuration, token: Cryptocurrency, expected_price_e8s: bigint, recurring: boolean, };
 export type UserIndexSearchArgs = { search_term: string, max_results: number, };
-export type UserIndexDeleteUserResponse = "Success" | "NotAuthorized" | "UserNotFound";
 export type UserIndexUnsuspendUserResponse = "Success" | "UserNotSuspended" | "UserNotFound" | { "InternalError": string };
 export type UserIndexExploreBotsArgs = { search_term?: string | undefined, page_index: number, page_size: number, };
 export type UserIndexSubmitProofOfUniquePersonhoodResponse = "Success" | { "Invalid": string } | "UserNotFound";
 export type UserIndexSubmitProofOfUniquePersonhoodArgs = { user_ii_principal: TSBytes, credential_jwt: string, };
 export type UserIndexSetUsernameResponse = "Success" | "UsernameTaken" | "UserNotFound" | "UsernameInvalid" | { "UsernameTooShort": number } | { "UsernameTooLong": number };
 export type UserIndexSetUsernameArgs = { username: string, };
+export type UserIndexUpdateBotResponse = "Success" | "NameInvalid" | "NameAlreadyExists" | "AvatarInvalid" | "EndpointInvalid" | "BotNotFound" | "BotSuspended" | "NotAuthorised" | "OwnerNotFound" | "OwnerSuspended" | "NewOwnerNotFound" | "NewOwnerSuspended" | "DefinitionNotFound" | "DefinitionInvalid" | "DescriptionTooLong" | "TooManyCommands";
 export type UserIndexSetDisplayNameResponse = "Success" | "UserNotFound" | "DisplayNameInvalid" | { "DisplayNameTooShort": number } | { "DisplayNameTooLong": number };
 export type UserIndexSetDisplayNameArgs = { display_name?: string | undefined, };
 export type UserIndexSetDiamondMembershipFeesResponse = "Success" | "Invalid";
@@ -526,11 +526,11 @@ export type UserIndexExternalAchievementsResponse = { "Success": UserIndexExtern
 export type UserIndexUserArgs = { user_id?: UserId | undefined, username?: string | undefined, };
 export type UserIndexBotUpdatesBotSchema = { id: UserId, owner: UserId, name: string, avatar_id?: bigint | undefined, endpoint: string, description: string, commands: Array<SlashCommandSchema>, last_updated: bigint, };
 export type UserIndexReferralMetricsResponse = { "Success": UserIndexReferralMetricsReferralMetrics };
-export type UserIndexDeleteUserArgs = { user_id: UserId, };
 export type UserIndexUnsuspendUserArgs = { user_id: UserId, };
 export type UserIndexUsersUserGroup = { users: Array<UserId>, updated_since: bigint, };
 export type UserIndexUsersArgs = { user_groups: Array<UserIndexUsersUserGroup>, users_suspended_since?: bigint | undefined, };
 export type UserIndexChitLeaderboardChitUserBalance = { user_id: UserId, username: string, balance: number, };
+export type UserIndexUpdateBotArgs = { bot_id: UserId, owner?: UserId | undefined, name?: string | undefined, avatar: OptionUpdateString, endpoint?: string | undefined, };
 export type UserIndexSetDiamondMembershipFeesArgs = { fees: DiamondMembershipFees, };
 export type UserIndexRegisterBotArgs = { principal: TSBytes, owner: UserId, name: string, avatar?: string | undefined, endpoint: string, description: string, commands: Array<SlashCommandSchema>, };
 export type UserIndexPlatformModeratorsGroupResponse = { "Success": ChatId };
diff --git a/tsBindings/userIndex/deleteUser/UserIndexDeleteUserArgs.ts b/tsBindings/userIndex/deleteUser/UserIndexDeleteUserArgs.ts
deleted file mode 100644
index 33dc0d764a..0000000000
--- a/tsBindings/userIndex/deleteUser/UserIndexDeleteUserArgs.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { UserId } from "../../shared/UserId";
-
-export type UserIndexDeleteUserArgs = { user_id: UserId, };
diff --git a/tsBindings/userIndex/deleteUser/UserIndexDeleteUserResponse.ts b/tsBindings/userIndex/deleteUser/UserIndexDeleteUserResponse.ts
deleted file mode 100644
index c2f1d08910..0000000000
--- a/tsBindings/userIndex/deleteUser/UserIndexDeleteUserResponse.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type UserIndexDeleteUserResponse = "Success" | "NotAuthorized" | "UserNotFound";
diff --git a/tsBindings/userIndex/updateBot/UserIndexUpdateBotArgs.ts b/tsBindings/userIndex/updateBot/UserIndexUpdateBotArgs.ts
new file mode 100644
index 0000000000..0db2cf6503
--- /dev/null
+++ b/tsBindings/userIndex/updateBot/UserIndexUpdateBotArgs.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { OptionUpdateString } from "../../shared/OptionUpdateString";
+import type { UserId } from "../../shared/UserId";
+
+export type UserIndexUpdateBotArgs = { bot_id: UserId, owner?: UserId | undefined, name?: string | undefined, avatar: OptionUpdateString, endpoint?: string | undefined, };
diff --git a/tsBindings/userIndex/updateBot/UserIndexUpdateBotResponse.ts b/tsBindings/userIndex/updateBot/UserIndexUpdateBotResponse.ts
new file mode 100644
index 0000000000..e834fba861
--- /dev/null
+++ b/tsBindings/userIndex/updateBot/UserIndexUpdateBotResponse.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type UserIndexUpdateBotResponse = "Success" | "NameInvalid" | "NameAlreadyExists" | "AvatarInvalid" | "EndpointInvalid" | "BotNotFound" | "BotSuspended" | "NotAuthorised" | "OwnerNotFound" | "OwnerSuspended" | "NewOwnerNotFound" | "NewOwnerSuspended" | "DefinitionNotFound" | "DefinitionInvalid" | "DescriptionTooLong" | "TooManyCommands";