diff --git a/assets/js/app.js b/assets/js/app.js
index bf4af30f..aa76c854 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -20,39 +20,15 @@ import "phoenix_html"
 import { Socket } from "phoenix"
 import NProgress from "nprogress"
 import { LiveSocket } from "phoenix_live_view"
-import QRCodeStyling from "qr-code-styling";
 import ClipboardJS from "clipboard"
-import { buildQrCodeOptions } from "./qrCodeUtils.js"
+import { appendQrCode, initQrDownload } from "./qrCodeUtils.js"
+import { initShareButtonClickHandler } from "./shareUtils.js"
 
 let csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute("content")
 
 let Hooks = {}
 const sortables = [];
 
-Hooks.CopyBrainstormingLinkButton = {
-  mounted() {
-    new ClipboardJS(this.el);
-  }
-}
-
-Hooks.NativeSharingButton = {
-  mounted() {
-    const shareData = {
-      title: this.el.getAttribute(`data-native-sharing-button-share-data-title`) || 'Mindwendel Brainstorming',
-      text: this.el.getAttribute(`data-native-sharing-button-share-data-text`) || 'Join my brainstorming',
-      url: this.el.getAttribute(`data-native-sharing-button-share-data-url`) || document.getElementById("brainstorming-link").value
-    }
-
-    if (navigator.share) {
-      this.el.addEventListener('click', (event) => {
-        navigator.share(shareData)
-          .then() // Do nothing
-          .catch(err => { console.log(`Error: ${err}`) })
-      })
-    }
-  }
-}
-
 // see https://github.com/drag-drop-touch-js/dragdroptouch for mobile support
 Hooks.Sortable = {
   mounted(){
@@ -89,32 +65,49 @@ Hooks.Modal = {
     window.addEventListener('mindwendel:hide-modal', closeModal);
   }
 }
-Hooks.QrCodeCanvas = {
+
+Hooks.CopyBrainstormingLinkButton = {
   mounted() {
-    const qrCodeCanvasElement = this.el
-    const qrCodeUrl = qrCodeCanvasElement.getAttribute("data-qr-code-url")
+    new ClipboardJS(this.el);
+  }
+}
 
-    const qrCodeOptions = buildQrCodeOptions(qrCodeUrl)
-    const qrCode = new QRCodeStyling(qrCodeOptions)
+let refShareClickListenerFunction;
+let refShareButton;
 
-    qrCode.append(qrCodeCanvasElement);
+Hooks.NativeSharingButton = {
+  mounted() {
+    refShareButton = this.el;
+    refShareClickListenerFunction = initShareButtonClickHandler(refShareButton);
+  },
+  updated() {
+    refShareButton.removeEventListener("click", refShareClickListenerFunction);
+    refShareButton = this.el;
+    refShareClickListenerFunction = initShareButtonClickHandler(refShareButton);
   }
 }
 
-Hooks.QrCodeDownloadButton = {
+Hooks.QrCodeCanvas = {
   mounted() {
-    const qrCodeUrl = this.el.getAttribute("data-qr-code-url");
-    const qrCodeFilename = this.el.getAttribute("data-qr-code-filename") || qrCodeUrl || "qrcode";
-    const qrCodeFileExtension = this.el.getAttribute("data-qr-code-file-extension") || "png";
+    appendQrCode(this.el);
+  },
+  updated() {
+    appendQrCode(this.el);
+  }
+}
 
-    const qrCodeOptions = buildQrCodeOptions(qrCodeUrl)
-    const qrCode = new QRCodeStyling(qrCodeOptions)
+let refQrClickListenerFunction;
+let refQrCodeDownloadButton;
 
-    this.el && this.el.addEventListener('click', () => {
-      qrCode.download({ name: qrCodeFilename, extension: qrCodeFileExtension })
-        .then() // Do nothing
-        .catch(err => { console.log(`Error: ${err}`) })
-    })
+Hooks.QrCodeDownloadButton = {
+  mounted() {
+    refQrCodeDownloadButton = this.el;
+    refQrClickListenerFunction = initQrDownload(refQrCodeDownloadButton);
+  },
+  updated() {
+    refQrCodeDownloadButton.removeEventListener("click", refQrClickListenerFunction);
+    refQrCodeDownloadButton = this.el;
+    refQrClickListenerFunction = initQrDownload(refQrCodeDownloadButton);
   }
 }
 
@@ -138,8 +131,9 @@ Hooks.SetIdeaLabelBackgroundColor = {
   }
 };
 
+// The brainstorming secret from the url ("#123") is added as well to the socket. The secret is not available on the server side by default.
 let liveSocket = new LiveSocket("/live", Socket, { 
-  hooks: Hooks, params: { _csrf_token: csrfToken }
+  hooks: Hooks, params: { _csrf_token: csrfToken, adminSecret: window.location.hash.substring(1) }
 })
 
 // Show progress bar on live navigation and form submits
diff --git a/assets/js/qrCodeUtils.js b/assets/js/qrCodeUtils.js
index d128040a..c2083636 100644
--- a/assets/js/qrCodeUtils.js
+++ b/assets/js/qrCodeUtils.js
@@ -1,4 +1,6 @@
-export const buildQrCodeOptions = (qrCodeUrl) => ({
+import QRCodeStyling from "qr-code-styling";
+
+const buildQrCodeOptions = (qrCodeUrl) => ({
   backgroundOptions: {
     color: "#fff",
   },
@@ -20,4 +22,31 @@ export const buildQrCodeOptions = (qrCodeUrl) => ({
   height: 300,
   type: "svg",
   width: 300
-})
+});
+
+export const appendQrCode = (qrCodeCanvasElement) => {
+  const qrCodeUrl = qrCodeCanvasElement.getAttribute("data-qr-code-url")
+
+  const qrCodeOptions = buildQrCodeOptions(qrCodeUrl)
+  const qrCode = new QRCodeStyling(qrCodeOptions)
+
+  qrCode.append(qrCodeCanvasElement);
+}
+
+export const initQrDownload = (button) => {
+  const qrCodeUrl = button.getAttribute("data-qr-code-url");
+  const qrCodeFilename = button.getAttribute("data-qr-code-filename") || qrCodeUrl || "qrcode";
+  const qrCodeFileExtension = button.getAttribute("data-qr-code-file-extension") || "png";
+
+  const qrCodeOptions = buildQrCodeOptions(qrCodeUrl)
+  const qrCode = new QRCodeStyling(qrCodeOptions)
+
+  const clickEventListener = () => {
+    qrCode.download({ name: qrCodeFilename, extension: qrCodeFileExtension })
+      .then() // Do nothing
+      .catch(err => { console.log(`Error: ${err}`) })
+  };
+
+  button && button.addEventListener('click', clickEventListener);
+  return clickEventListener;
+}
diff --git a/assets/js/shareUtils.js b/assets/js/shareUtils.js
new file mode 100644
index 00000000..3e0d81f5
--- /dev/null
+++ b/assets/js/shareUtils.js
@@ -0,0 +1,18 @@
+export const initShareButtonClickHandler = (button) => {
+  const shareData = {
+    title: button.getAttribute(`data-native-sharing-button-share-data-title`) || 'Mindwendel Brainstorming',
+    text: button.getAttribute(`data-native-sharing-button-share-data-text`) || 'Join my brainstorming',
+    url: document.getElementById("data-native-sharing-button-share-data-url") || document.getElementById("brainstorming-link-input-readonly").value
+  }
+
+  const clickHandler = (_event) => {
+    navigator.share(shareData)
+      .then() // Do nothing
+      .catch(err => { console.log(`Error: ${err}`) })
+  }
+
+  if (navigator.share) {
+    button.addEventListener('click', clickHandler);
+    return clickHandler;
+  }
+}
\ No newline at end of file
diff --git a/lib/mindwendel/accounts.ex b/lib/mindwendel/accounts.ex
index 6a28459f..76d4f877 100644
--- a/lib/mindwendel/accounts.ex
+++ b/lib/mindwendel/accounts.ex
@@ -3,6 +3,7 @@ defmodule Mindwendel.Accounts do
   alias Mindwendel.Repo
   alias Mindwendel.Accounts.User
   alias Mindwendel.Brainstormings.Brainstorming
+  alias Mindwendel.Accounts.BrainstormingModeratingUser
 
   require Logger
 
@@ -47,7 +48,7 @@ defmodule Mindwendel.Accounts do
   end
 
   def get_user(id) do
-    Repo.get(User, id) |> Repo.preload(:brainstormings)
+    Repo.get(User, id) |> Repo.preload([:brainstormings, :moderated_brainstormings])
   rescue
     Ecto.Query.CastError -> nil
   end
@@ -70,6 +71,36 @@ defmodule Mindwendel.Accounts do
     |> Repo.update()
   end
 
+  @doc """
+  Adds a user as moderating user to a brainstorming.
+
+  ## Examples
+
+      iex> add_moderating_user(brainstorming, user)
+      %Brainstorming{}
+
+  """
+  def add_moderating_user(%Brainstorming{} = brainstorming, %User{} = user) do
+    if user.id in Enum.map(brainstorming.moderating_users, fn e -> e.id end) do
+      {:error}
+    else
+      %BrainstormingModeratingUser{brainstorming_id: brainstorming.id, user_id: user.id}
+      |> BrainstormingModeratingUser.changeset()
+      |> Repo.insert()
+    end
+  end
+
+  def add_moderating_user(%Brainstorming{} = brainstorming, user_id) when is_binary(user_id) do
+    case Ecto.UUID.dump(user_id) do
+      :error -> {:error}
+      {:ok, _} -> add_moderating_user(brainstorming, get_or_create_user(user_id))
+    end
+  end
+
+  def add_moderating_user(%Brainstorming{} = _brainstorming, user_id) when is_nil(user_id) do
+    {:error}
+  end
+
   @doc """
   Connects user to a brainstorm.
 
@@ -80,9 +111,6 @@ defmodule Mindwendel.Accounts do
       iex> merge_brainstorming_user(brainstorming, user)
       %Brainstorming{}
 
-      iex> update_user(user, %{field: bad_value})
-      {:error, %Ecto.Changeset{}}
-
   """
   def merge_brainstorming_user(%Brainstorming{} = brainstorming, %User{} = user) do
     # credo:disable-for-next-line
diff --git a/lib/mindwendel/brainstormings/brainstorming_moderating_user.ex b/lib/mindwendel/accounts/brainstorming_moderating_user.ex
similarity index 91%
rename from lib/mindwendel/brainstormings/brainstorming_moderating_user.ex
rename to lib/mindwendel/accounts/brainstorming_moderating_user.ex
index c36f204f..1c37db36 100644
--- a/lib/mindwendel/brainstormings/brainstorming_moderating_user.ex
+++ b/lib/mindwendel/accounts/brainstorming_moderating_user.ex
@@ -1,4 +1,4 @@
-defmodule Mindwendel.Brainstormings.BrainstormingModeratingUser do
+defmodule Mindwendel.Accounts.BrainstormingModeratingUser do
   # Not using Mindwendel.Schema as the `@derive` in there clashes here
   use Ecto.Schema
   alias Mindwendel.Brainstormings.Brainstorming
diff --git a/lib/mindwendel/accounts/user.ex b/lib/mindwendel/accounts/user.ex
index ea4168d4..a40ccb96 100644
--- a/lib/mindwendel/accounts/user.ex
+++ b/lib/mindwendel/accounts/user.ex
@@ -5,7 +5,7 @@ defmodule Mindwendel.Accounts.User do
 
   alias Mindwendel.Brainstormings.Brainstorming
   alias Mindwendel.Brainstormings.Idea
-  alias Mindwendel.Brainstormings.BrainstormingModeratingUser
+  alias Mindwendel.Accounts.BrainstormingModeratingUser
   alias Mindwendel.Accounts.BrainstormingUser
 
   schema "users" do
diff --git a/lib/mindwendel/brainstormings.ex b/lib/mindwendel/brainstormings.ex
index 642778e8..542939ca 100644
--- a/lib/mindwendel/brainstormings.ex
+++ b/lib/mindwendel/brainstormings.ex
@@ -13,7 +13,6 @@ defmodule Mindwendel.Brainstormings do
   alias Mindwendel.Lanes
   alias Mindwendel.Ideas
   alias Mindwendel.Brainstormings.Brainstorming
-  alias Mindwendel.Brainstormings.BrainstormingModeratingUser
 
   require Logger
 
@@ -36,12 +35,6 @@ defmodule Mindwendel.Brainstormings do
     )
   end
 
-  def add_moderating_user(%Brainstorming{} = brainstorming, %User{} = user) do
-    %BrainstormingModeratingUser{brainstorming_id: brainstorming.id, user_id: user.id}
-    |> BrainstormingModeratingUser.changeset()
-    |> Repo.insert()
-  end
-
   @doc """
   Returns the list of brainstormings.
 
@@ -237,6 +230,19 @@ defmodule Mindwendel.Brainstormings do
     brainstorming
   end
 
+  @doc """
+  Validates the given secret against the brainstorming. Returns true/false.
+
+  ## Examples
+
+      iex> validate_admin_secret(brainstorming, abc)
+      false
+
+  """
+  def validate_admin_secret(brainstorming, admin_secret_id) do
+    brainstorming.admin_url_id == admin_secret_id
+  end
+
   @doc """
   Returns a subscibe result.
 
diff --git a/lib/mindwendel/brainstormings/brainstorming.ex b/lib/mindwendel/brainstormings/brainstorming.ex
index 80ee5152..6fb176ea 100644
--- a/lib/mindwendel/brainstormings/brainstorming.ex
+++ b/lib/mindwendel/brainstormings/brainstorming.ex
@@ -6,13 +6,12 @@ defmodule Mindwendel.Brainstormings.Brainstorming do
   alias Mindwendel.Brainstormings.Idea
   alias Mindwendel.Brainstormings.IdeaLabel
   alias Mindwendel.Brainstormings.Lane
-  alias Mindwendel.Brainstormings.BrainstormingModeratingUser
+  alias Mindwendel.Accounts.BrainstormingModeratingUser
   alias Mindwendel.Accounts.User
   alias Mindwendel.Accounts.BrainstormingUser
 
   schema "brainstormings" do
     field :name, :string
-    field :option_show_link_to_settings, :boolean
     field :option_allow_manual_ordering, :boolean
     # credo:disable-for-next-line
     # Todo: The following line can be changed `field :admin_url_id, Ecto.UUID, autogenerate: true`
@@ -35,7 +34,6 @@ defmodule Mindwendel.Brainstormings.Brainstorming do
     brainstorming
     |> cast(attrs, [
       :name,
-      :option_show_link_to_settings,
       :option_allow_manual_ordering,
       :filter_labels_ids
     ])
diff --git a/lib/mindwendel/brainstormings/idea.ex b/lib/mindwendel/brainstormings/idea.ex
index 6c208bb7..30709bee 100644
--- a/lib/mindwendel/brainstormings/idea.ex
+++ b/lib/mindwendel/brainstormings/idea.ex
@@ -15,7 +15,6 @@ defmodule Mindwendel.Brainstormings.Idea do
   alias Mindwendel.UrlPreview
   alias Mindwendel.Accounts.User
 
-  @label_values [:label_1, :label_2, :label_3, :label_4, :label_5]
   @max_file_attachments 2
 
   schema "ideas" do
@@ -23,14 +22,12 @@ defmodule Mindwendel.Brainstormings.Idea do
     field :position_order, :integer
     field :username, :string, default: "Anonymous"
     field :comments_count, :integer
-    field :deprecated_label, Ecto.Enum, source: :label, values: @label_values
     has_one :link, Link
     belongs_to :user, User
     has_many :likes, Like
     has_many :comments, Comment, preload_order: [desc: :inserted_at]
     has_many :files, File
     belongs_to :brainstorming, Brainstorming
-    belongs_to :label, IdeaLabel, on_replace: :nilify
     belongs_to :lane, Lane
     many_to_many :idea_labels, IdeaLabel, join_through: IdeaIdeaLabel, on_replace: :delete
 
@@ -45,8 +42,6 @@ defmodule Mindwendel.Brainstormings.Idea do
       :body,
       :brainstorming_id,
       :lane_id,
-      :deprecated_label,
-      :label_id,
       :user_id,
       :position_order,
       :comments_count
@@ -54,7 +49,6 @@ defmodule Mindwendel.Brainstormings.Idea do
     |> validate_required([:username, :body, :brainstorming_id])
     |> maybe_put_idea_labels(attrs)
     |> validate_length(:body, min: 1, max: 1023)
-    |> validate_inclusion(:deprecated_label, @label_values)
     |> add_position_order_if_missing()
     |> validate_attachment_count(attrs)
     |> maybe_put_attachments(idea, attrs)
diff --git a/lib/mindwendel/ideas.ex b/lib/mindwendel/ideas.ex
index 5730f375..75e029a8 100644
--- a/lib/mindwendel/ideas.ex
+++ b/lib/mindwendel/ideas.ex
@@ -87,7 +87,6 @@ defmodule Mindwendel.Ideas do
     |> Repo.preload([
       :link,
       :likes,
-      :label,
       :idea_labels,
       :comments
     ])
diff --git a/lib/mindwendel_web/channels/user_socket.ex b/lib/mindwendel_web/channels/user_socket.ex
deleted file mode 100644
index 22ec171d..00000000
--- a/lib/mindwendel_web/channels/user_socket.ex
+++ /dev/null
@@ -1,35 +0,0 @@
-defmodule MindwendelWeb.UserSocket do
-  use Phoenix.Socket
-
-  ## Channels
-  # channel "room:*", MindwendelWeb.RoomChannel
-
-  # Socket params are passed from the client and can
-  # be used to verify and authenticate a user. After
-  # verification, you can put default assigns into
-  # the socket that will be set for all channels, ie
-  #
-  #     {:ok, assign(socket, :user_id, verified_user_id)}
-  #
-  # To deny connection, return `:error`.
-  #
-  # See `Phoenix.Token` documentation for examples in
-  # performing token verification on connect.
-  @impl true
-  def connect(_params, socket, _connect_info) do
-    {:ok, socket}
-  end
-
-  # Socket id's are topics that allow you to identify all sockets for a given user:
-  #
-  #     def id(socket), do: "user_socket:#{socket.assigns.user_id}"
-  #
-  # Would allow you to broadcast a "disconnect" event and terminate
-  # all active sockets and channels for a given user:
-  #
-  #     MindwendelWeb.Endpoint.broadcast("user_socket:#{user.id}", "disconnect", %{})
-  #
-  # Returning `nil` makes this socket anonymous.
-  @impl true
-  def id(_socket), do: nil
-end
diff --git a/lib/mindwendel_web/components/core_components.ex b/lib/mindwendel_web/components/core_components.ex
index d72b6dac..8bfe0e62 100644
--- a/lib/mindwendel_web/components/core_components.ex
+++ b/lib/mindwendel_web/components/core_components.ex
@@ -280,7 +280,11 @@ defmodule MindwendelWeb.CoreComponents do
   attr :errors, :list, default: []
   attr :checked, :boolean, doc: "the checked flag for checkbox inputs"
   attr :prompt, :string, default: nil, doc: "the prompt for select inputs"
-  attr :options, :list, doc: "the options to pass to Phoenix.HTML.Form.options_for_select/2"
+
+  attr :options, :list,
+    default: [],
+    doc: "the options to pass to Phoenix.HTML.Form.options_for_select/2"
+
   attr :multiple, :boolean, default: false, doc: "the multiple flag for select inputs"
 
   attr :rest, :global,
@@ -305,7 +309,11 @@ defmodule MindwendelWeb.CoreComponents do
       end)
 
     ~H"""
-    <div class="form-check form-check-inline">
+    <div class={[
+      "form-check",
+      @options == [] && "form-check-inline",
+      @options == ["switch"] && "form-switch"
+    ]}>
       <label class="form-check-label">
         <input type="hidden" name={@name} value="false" disabled={@rest[:disabled]} />
         <input
diff --git a/lib/mindwendel_web/endpoint.ex b/lib/mindwendel_web/endpoint.ex
index 0dae0719..d970fdfd 100644
--- a/lib/mindwendel_web/endpoint.ex
+++ b/lib/mindwendel_web/endpoint.ex
@@ -10,10 +10,6 @@ defmodule MindwendelWeb.Endpoint do
     signing_salt: "Kxo5qCGx"
   ]
 
-  socket "/socket", MindwendelWeb.UserSocket,
-    websocket: true,
-    longpoll: false
-
   socket "/live", Phoenix.LiveView.Socket, websocket: [connect_info: [session: @session_options]]
 
   # Serve at "/" the static files from "priv/static" directory.
diff --git a/lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex b/lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex
index b2646fe8..064c77c8 100644
--- a/lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex
+++ b/lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex
@@ -58,22 +58,7 @@
   <div class="card-body">
     <.simple_form for={@form} phx-submit="save" phx-change="save" id="form-edit-brainstorming">
       <.input field={@form[:name]} type="text" label="Name" phx-debounce={300} />
-
-      <div class="mb-3 mt-3">
-        <.input
-          field={@form[:option_show_link_to_settings]}
-          type="checkbox"
-          id="checkbox-option-show-link-to-settings"
-          label={gettext("Show brainstorming settings link for all users")}
-        />
-        <br />
-        <small class="form-text text-muted">
-          <%= gettext(
-            "Warning: Please make sure you save the admin link at the top, before hiding the settings link!"
-          ) %>
-        </small>
-      </div>
-      <div>
+      <div class="mt-2">
         <.input
           field={@form[:option_allow_manual_ordering]}
           type="checkbox"
diff --git a/lib/mindwendel_web/live/brainstorming_live/share_component.ex b/lib/mindwendel_web/live/brainstorming_live/share_component.ex
index 21caa3b8..9c863c57 100644
--- a/lib/mindwendel_web/live/brainstorming_live/share_component.ex
+++ b/lib/mindwendel_web/live/brainstorming_live/share_component.ex
@@ -1,3 +1,27 @@
 defmodule MindwendelWeb.BrainstormingLive.ShareComponent do
   use MindwendelWeb, :live_component
+
+  def handle_event("toggle_url_secret", _value, socket) do
+    %{brainstorming: brainstorming, uri: uri, current_user: current_user} = socket.assigns
+
+    if has_moderating_permission(brainstorming, current_user) do
+      new_uri = create_download_link(brainstorming, uri)
+      {:noreply, assign(socket, :uri, new_uri)}
+    else
+      {:noreply, socket}
+    end
+  end
+
+  def secret_in_uri(uri) do
+    uri |> String.split("#") |> length == 2
+  end
+
+  defp create_download_link(brainstorming, uri) do
+    if secret_in_uri(uri) do
+      url_fragments = String.split(uri, "#")
+      List.first(url_fragments)
+    else
+      "#{uri}##{brainstorming.admin_url_id}"
+    end
+  end
 end
diff --git a/lib/mindwendel_web/live/brainstorming_live/share_component.html.heex b/lib/mindwendel_web/live/brainstorming_live/share_component.html.heex
index a7cdfa9d..2f8a9568 100644
--- a/lib/mindwendel_web/live/brainstorming_live/share_component.html.heex
+++ b/lib/mindwendel_web/live/brainstorming_live/share_component.html.heex
@@ -30,6 +30,20 @@
         <i class="bi-share-fill"></i>
       </button>
     </div>
+    <div class="input-group mt-3">
+      <%= if has_moderating_permission(@brainstorming, @current_user) do %>
+        <.input
+          name="admin_url_id"
+          type="checkbox"
+          options={["switch"]}
+          id="brainstorming-link-toggle-admin-secret"
+          phx-click="toggle_url_secret"
+          phx-target={@myself}
+          checked={secret_in_uri(@uri)}
+          label={gettext("Give moderating permissions")}
+        />
+      <% end %>
+    </div>
   </div>
 
   <hr />
diff --git a/lib/mindwendel_web/live/brainstorming_live/show.ex b/lib/mindwendel_web/live/brainstorming_live/show.ex
index 778b133d..5a95d326 100644
--- a/lib/mindwendel_web/live/brainstorming_live/show.ex
+++ b/lib/mindwendel_web/live/brainstorming_live/show.ex
@@ -12,13 +12,20 @@ defmodule MindwendelWeb.BrainstormingLive.Show do
   def mount(%{"id" => id}, session, socket) do
     if connected?(socket), do: Brainstormings.subscribe(id)
 
+    # If the admin secret in the URL after the hash (only available inside the client session) is given, add the user as moderating user to the brainstorming.
+    # If not, add the user as normal user.
     current_user_id = Mindwendel.Services.SessionService.get_current_user_id(session)
+    brainstorming = Brainstormings.get_brainstorming!(id)
+    admin_secret = get_connect_params(socket)["adminSecret"]
 
-    brainstorming =
-      Brainstormings.get_brainstorming!(id)
-      |> Accounts.merge_brainstorming_user(current_user_id)
+    if Brainstormings.validate_admin_secret(brainstorming, admin_secret) do
+      Accounts.add_moderating_user(brainstorming, current_user_id)
+    end
+
+    Accounts.merge_brainstorming_user(brainstorming, current_user_id)
 
     lanes = Lanes.get_lanes_for_brainstorming_with_labels_filtered(id)
+    # load the user, also for permissions of brainstormings
     current_user = Mindwendel.Accounts.get_user(current_user_id)
 
     {
diff --git a/lib/mindwendel_web/live/brainstorming_live/show.html.heex b/lib/mindwendel_web/live/brainstorming_live/show.html.heex
index 518bfe3b..8ef0e298 100644
--- a/lib/mindwendel_web/live/brainstorming_live/show.html.heex
+++ b/lib/mindwendel_web/live/brainstorming_live/show.html.heex
@@ -37,7 +37,7 @@
         <i class="bi-share-fill"></i>
       </.link>
 
-      <%= if @brainstorming.option_show_link_to_settings do %>
+      <%= if has_moderating_permission(@brainstorming, @current_user) do %>
         <.link
           href={~p"/admin/brainstormings/#{@brainstorming.admin_url_id}/edit"}
           class="btn btn-secondary m-1"
diff --git a/lib/mindwendel_web/live/idea_live/card_component.ex b/lib/mindwendel_web/live/idea_live/card_component.ex
index 19fc768b..36b468e5 100644
--- a/lib/mindwendel_web/live/idea_live/card_component.ex
+++ b/lib/mindwendel_web/live/idea_live/card_component.ex
@@ -10,7 +10,7 @@ defmodule MindwendelWeb.IdeaLive.CardComponent do
 
     %{current_user: current_user, brainstorming: brainstorming} = socket.assigns
 
-    if current_user.id in [idea.user_id | brainstorming.moderating_users |> Enum.map(& &1.id)] do
+    if has_moderating_or_ownership_permission(brainstorming, idea, current_user) do
       {:ok, _} = Ideas.delete_idea(idea)
     end
 
diff --git a/lib/mindwendel_web/live/label_live/captions_component.ex b/lib/mindwendel_web/live/label_live/captions_component.ex
index 82108e9d..ba471259 100644
--- a/lib/mindwendel_web/live/label_live/captions_component.ex
+++ b/lib/mindwendel_web/live/label_live/captions_component.ex
@@ -4,8 +4,7 @@ defmodule MindwendelWeb.LabelLive.CaptionsComponent do
   alias Mindwendel.Brainstormings
 
   def handle_event("set_filter_idea_label", %{"id" => idea_label_id}, socket) do
-    brainstorming = socket.assigns.brainstorming
-    current_user = socket.assigns.current_user
+    %{current_user: current_user, brainstorming: brainstorming} = socket.assigns
 
     if has_moderating_permission(brainstorming, current_user) do
       # If the filter is already present, remove it as its toggled. If not, add it.
diff --git a/lib/mindwendel_web/live/live_helpers.ex b/lib/mindwendel_web/live/live_helpers.ex
index 84e98c03..1983f1ce 100644
--- a/lib/mindwendel_web/live/live_helpers.ex
+++ b/lib/mindwendel_web/live/live_helpers.ex
@@ -9,7 +9,7 @@ defmodule MindwendelWeb.LiveHelpers do
   end
 
   def has_moderating_permission(brainstorming, current_user) do
-    Enum.member?(brainstorming.moderating_users |> Enum.map(& &1.id), current_user.id)
+    Enum.member?(current_user.moderated_brainstormings |> Enum.map(& &1.id), brainstorming.id)
   end
 
   def has_ownership(record, current_user) do
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 6fd797a0..4d47572e 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -26,12 +26,12 @@ msgstr "Wie können wir ..."
 msgid "Ready?"
 msgstr "Fertig?"
 
-#: lib/mindwendel_web/live/brainstorming_live/show.ex:168
+#: lib/mindwendel_web/live/brainstorming_live/show.ex:175
 #, elixir-autogen, elixir-format
 msgid "%{name} - Edit"
 msgstr "%{name} - Editieren"
 
-#: lib/mindwendel_web/live/brainstorming_live/show.ex:145
+#: lib/mindwendel_web/live/brainstorming_live/show.ex:152
 #, elixir-autogen, elixir-format
 msgid "%{name} - New Idea"
 msgstr "%{name} - Neue Idee"
@@ -42,7 +42,7 @@ msgstr "%{name} - Neue Idee"
 msgid "Are you sure you want to delete this idea?"
 msgstr "Möchtest du die Idee löschen?"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:188
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:173
 #, elixir-autogen, elixir-format
 msgid "Attention: This will delete the brainstorming with all belonging ideas and other associated records to it. This cant be undone"
 msgstr "Achtung: Hiermit löschst du das Brainstorming und alle dazugehörigen Ideen. Diese Aktion kann nicht rückgängig gemacht werden."
@@ -73,22 +73,22 @@ msgstr "Erstelle ein Brainstorming."
 msgid "Create!"
 msgstr "Erstellen!"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:198
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:183
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr "Löschen"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:182
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:167
 #, elixir-autogen, elixir-format
 msgid "Delete Brainstorming"
 msgstr "Lösche Brainstorming"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:146
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:131
 #, elixir-autogen, elixir-format
 msgid "Export to CSV"
 msgstr "Export als CSV"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:150
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:135
 #, elixir-autogen, elixir-format
 msgid "Export to HTML"
 msgstr "Export als HTML"
@@ -179,7 +179,7 @@ msgstr "Dein Brainstorming wurde erstellt! Teile den Link mit anderen Personen u
 msgid "Edit Brainstorming"
 msgstr "Editiere Brainstorming"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:139
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:124
 #, elixir-autogen, elixir-format
 msgid "Export"
 msgstr "Export"
@@ -212,42 +212,32 @@ msgstr "Von"
 msgid "Administration for brainstorming: %{name}"
 msgstr "Administration für: %{name}"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:67
-#, elixir-autogen, elixir-format
-msgid "Show brainstorming settings link for all users"
-msgstr "Zeige Link zur Administration für alle Nutzer"
-
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:71
-#, elixir-autogen, elixir-format
-msgid "Warning: Please make sure you save the admin link at the top, before hiding the settings link!"
-msgstr "Achtung: Bitte speichere den Admin-Link oben ab, bevor du den Link zur Administration versteckst."
-
 #: lib/mindwendel_web/controllers/static_page_html/home.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Brainstormings will be deleted after %{days} days."
 msgstr "Brainstormings werden nach %{days} Tagen gelöscht."
 
-#: lib/mindwendel/brainstormings/brainstorming.ex:75
+#: lib/mindwendel/brainstormings/brainstorming.ex:73
 #, elixir-autogen, elixir-format
 msgid "cyan"
 msgstr "Cyan"
 
-#: lib/mindwendel/brainstormings/brainstorming.ex:76
+#: lib/mindwendel/brainstormings/brainstorming.ex:74
 #, elixir-autogen, elixir-format
 msgid "gray dark"
 msgstr "Dunkelgrau"
 
-#: lib/mindwendel/brainstormings/brainstorming.ex:77
+#: lib/mindwendel/brainstormings/brainstorming.ex:75
 #, elixir-autogen, elixir-format
 msgid "green"
 msgstr "Grün"
 
-#: lib/mindwendel/brainstormings/brainstorming.ex:78
+#: lib/mindwendel/brainstormings/brainstorming.ex:76
 #, elixir-autogen, elixir-format
 msgid "red"
 msgstr "Rot"
 
-#: lib/mindwendel/brainstormings/brainstorming.ex:79
+#: lib/mindwendel/brainstormings/brainstorming.ex:77
 #, elixir-autogen, elixir-format
 msgid "yellow"
 msgstr "Gelb"
@@ -281,17 +271,17 @@ msgstr "Teilen"
 msgid "Share brainstorming"
 msgstr "Teile Dein Brainstorming"
 
-#: lib/mindwendel_web/live/brainstorming_live/share_component.html.heex:65
+#: lib/mindwendel_web/live/brainstorming_live/share_component.html.heex:79
 #, elixir-autogen, elixir-format
 msgid "Download as png"
 msgstr "Download als PNG"
 
-#: lib/mindwendel_web/live/brainstorming_live/share_component.html.heex:54
+#: lib/mindwendel_web/live/brainstorming_live/share_component.html.heex:68
 #, elixir-autogen, elixir-format
 msgid "Download as svg"
 msgstr "Download als SVG"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:194
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:179
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Brainstorming delete are you sure"
 msgstr "Bist du sicher, dass das Brainstorming gelöscht werden soll?"
@@ -301,18 +291,18 @@ msgstr "Bist du sicher, dass das Brainstorming gelöscht werden soll?"
 msgid "Update idea"
 msgstr "Idee bearbeiten"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:163
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:148
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Attention: This will delete all ideas in this brainstorming. The brainstorming itself and labels will be left unchanged. This cant be undone."
 msgstr "Achtung: Hiermit löscht Du alle Ideen in diesem Brainstorming. Das Brainstorming und die Labels bleiben unverändert. Diese Aktion kann nicht rückgängig gemacht werden."
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:171
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:156
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Brainstorming will be emptied - are you sure"
 msgstr "Bist du sicher, dass das Brainstorming geleert werden soll?"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:157
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:173
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:142
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:158
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Empty brainstorming"
 msgstr "Leere das Brainstorming"
@@ -327,7 +317,7 @@ msgstr "Brainstorming wird gelöscht %{days}"
 msgid "Attention: Brainstormings will be deleted %{available_until} after last access!"
 msgstr "Achtung: Brainstormings werden %{available_until} nach dem letzten Zugriff gelöscht!"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:81
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Allow users to change the order of ideas"
 msgstr "Nutzern das Verschieben und Sortieren von Ideen erlauben"
@@ -337,7 +327,7 @@ msgstr "Nutzern das Verschieben und Sortieren von Ideen erlauben"
 msgid "Back"
 msgstr "Zurück"
 
-#: lib/mindwendel_web/components/core_components.ex:514
+#: lib/mindwendel_web/components/core_components.ex:522
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
@@ -378,32 +368,32 @@ msgstr ""
 msgid "close"
 msgstr "Schließen"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:129
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:114
 #, elixir-autogen, elixir-format
 msgid "Add idea label"
 msgstr "Neues Label"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:101
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:86
 #, elixir-autogen, elixir-format
 msgid "Choose the label color"
 msgstr "Labelfarbe wählen"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:90
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:75
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit Brainstorming Labels"
 msgstr "Editiere Brainstorming"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:117
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:102
 #, elixir-autogen, elixir-format
 msgid "Remove idea label"
 msgstr "Löschen"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:109
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:94
 #, elixir-autogen, elixir-format
 msgid "Type the label name"
 msgstr "Gebe dem Label einen Namen"
 
-#: lib/mindwendel_web/live/brainstorming_live/show.ex:155
+#: lib/mindwendel_web/live/brainstorming_live/show.ex:162
 #, elixir-autogen, elixir-format, fuzzy
 msgid "%{name} - New Lane"
 msgstr "%{name} - Neue Idee"
@@ -574,3 +564,8 @@ msgstr "Datenschutzerklärung"
 #, elixir-autogen, elixir-format
 msgid "Idea details"
 msgstr "Detailansicht"
+
+#: lib/mindwendel_web/live/brainstorming_live/share_component.html.heex:43
+#, elixir-autogen, elixir-format
+msgid "Give moderating permissions"
+msgstr "Änderungen erlauben"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index ce5580c0..1ed0acf2 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -25,12 +25,12 @@ msgstr ""
 msgid "Ready?"
 msgstr ""
 
-#: lib/mindwendel_web/live/brainstorming_live/show.ex:168
+#: lib/mindwendel_web/live/brainstorming_live/show.ex:175
 #, elixir-autogen, elixir-format
 msgid "%{name} - Edit"
 msgstr ""
 
-#: lib/mindwendel_web/live/brainstorming_live/show.ex:145
+#: lib/mindwendel_web/live/brainstorming_live/show.ex:152
 #, elixir-autogen, elixir-format
 msgid "%{name} - New Idea"
 msgstr ""
@@ -41,7 +41,7 @@ msgstr ""
 msgid "Are you sure you want to delete this idea?"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:188
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:173
 #, elixir-autogen, elixir-format
 msgid "Attention: This will delete the brainstorming with all belonging ideas and other associated records to it. This cant be undone"
 msgstr ""
@@ -72,22 +72,22 @@ msgstr ""
 msgid "Create!"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:198
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:183
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:182
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:167
 #, elixir-autogen, elixir-format
 msgid "Delete Brainstorming"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:146
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:131
 #, elixir-autogen, elixir-format
 msgid "Export to CSV"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:150
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:135
 #, elixir-autogen, elixir-format
 msgid "Export to HTML"
 msgstr ""
@@ -178,7 +178,7 @@ msgstr ""
 msgid "Edit Brainstorming"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:139
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:124
 #, elixir-autogen, elixir-format
 msgid "Export"
 msgstr ""
@@ -211,42 +211,32 @@ msgstr ""
 msgid "Administration for brainstorming: %{name}"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:67
-#, elixir-autogen, elixir-format
-msgid "Show brainstorming settings link for all users"
-msgstr ""
-
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:71
-#, elixir-autogen, elixir-format
-msgid "Warning: Please make sure you save the admin link at the top, before hiding the settings link!"
-msgstr ""
-
 #: lib/mindwendel_web/controllers/static_page_html/home.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Brainstormings will be deleted after %{days} days."
 msgstr ""
 
-#: lib/mindwendel/brainstormings/brainstorming.ex:75
+#: lib/mindwendel/brainstormings/brainstorming.ex:73
 #, elixir-autogen, elixir-format
 msgid "cyan"
 msgstr ""
 
-#: lib/mindwendel/brainstormings/brainstorming.ex:76
+#: lib/mindwendel/brainstormings/brainstorming.ex:74
 #, elixir-autogen, elixir-format
 msgid "gray dark"
 msgstr ""
 
-#: lib/mindwendel/brainstormings/brainstorming.ex:77
+#: lib/mindwendel/brainstormings/brainstorming.ex:75
 #, elixir-autogen, elixir-format
 msgid "green"
 msgstr ""
 
-#: lib/mindwendel/brainstormings/brainstorming.ex:78
+#: lib/mindwendel/brainstormings/brainstorming.ex:76
 #, elixir-autogen, elixir-format
 msgid "red"
 msgstr ""
 
-#: lib/mindwendel/brainstormings/brainstorming.ex:79
+#: lib/mindwendel/brainstormings/brainstorming.ex:77
 #, elixir-autogen, elixir-format
 msgid "yellow"
 msgstr ""
@@ -280,17 +270,17 @@ msgstr ""
 msgid "Share brainstorming"
 msgstr ""
 
-#: lib/mindwendel_web/live/brainstorming_live/share_component.html.heex:65
+#: lib/mindwendel_web/live/brainstorming_live/share_component.html.heex:79
 #, elixir-autogen, elixir-format
 msgid "Download as png"
 msgstr ""
 
-#: lib/mindwendel_web/live/brainstorming_live/share_component.html.heex:54
+#: lib/mindwendel_web/live/brainstorming_live/share_component.html.heex:68
 #, elixir-autogen, elixir-format
 msgid "Download as svg"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:194
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:179
 #, elixir-autogen, elixir-format
 msgid "Brainstorming delete are you sure"
 msgstr ""
@@ -300,18 +290,18 @@ msgstr ""
 msgid "Update idea"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:163
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:148
 #, elixir-autogen, elixir-format
 msgid "Attention: This will delete all ideas in this brainstorming. The brainstorming itself and labels will be left unchanged. This cant be undone."
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:171
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:156
 #, elixir-autogen, elixir-format
 msgid "Brainstorming will be emptied - are you sure"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:157
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:173
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:142
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:158
 #, elixir-autogen, elixir-format
 msgid "Empty brainstorming"
 msgstr ""
@@ -326,7 +316,7 @@ msgstr ""
 msgid "Attention: Brainstormings will be deleted %{available_until} after last access!"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:81
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Allow users to change the order of ideas"
 msgstr ""
@@ -336,7 +326,7 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: lib/mindwendel_web/components/core_components.ex:514
+#: lib/mindwendel_web/components/core_components.ex:522
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
@@ -377,32 +367,32 @@ msgstr ""
 msgid "close"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:129
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:114
 #, elixir-autogen, elixir-format
 msgid "Add idea label"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:101
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:86
 #, elixir-autogen, elixir-format
 msgid "Choose the label color"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:90
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Edit Brainstorming Labels"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:117
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:102
 #, elixir-autogen, elixir-format
 msgid "Remove idea label"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:109
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:94
 #, elixir-autogen, elixir-format
 msgid "Type the label name"
 msgstr ""
 
-#: lib/mindwendel_web/live/brainstorming_live/show.ex:155
+#: lib/mindwendel_web/live/brainstorming_live/show.ex:162
 #, elixir-autogen, elixir-format
 msgid "%{name} - New Lane"
 msgstr ""
@@ -573,3 +563,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Idea details"
 msgstr ""
+
+#: lib/mindwendel_web/live/brainstorming_live/share_component.html.heex:43
+#, elixir-autogen, elixir-format
+msgid "Give moderating permissions"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index a490ebf3..d16618e4 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -26,12 +26,12 @@ msgstr ""
 msgid "Ready?"
 msgstr ""
 
-#: lib/mindwendel_web/live/brainstorming_live/show.ex:168
+#: lib/mindwendel_web/live/brainstorming_live/show.ex:175
 #, elixir-autogen, elixir-format
 msgid "%{name} - Edit"
 msgstr ""
 
-#: lib/mindwendel_web/live/brainstorming_live/show.ex:145
+#: lib/mindwendel_web/live/brainstorming_live/show.ex:152
 #, elixir-autogen, elixir-format
 msgid "%{name} - New Idea"
 msgstr ""
@@ -42,7 +42,7 @@ msgstr ""
 msgid "Are you sure you want to delete this idea?"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:188
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:173
 #, elixir-autogen, elixir-format
 msgid "Attention: This will delete the brainstorming with all belonging ideas and other associated records to it. This cant be undone"
 msgstr ""
@@ -73,22 +73,22 @@ msgstr ""
 msgid "Create!"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:198
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:183
 #, elixir-autogen, elixir-format
 msgid "Delete"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:182
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:167
 #, elixir-autogen, elixir-format
 msgid "Delete Brainstorming"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:146
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:131
 #, elixir-autogen, elixir-format
 msgid "Export to CSV"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:150
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:135
 #, elixir-autogen, elixir-format
 msgid "Export to HTML"
 msgstr ""
@@ -179,7 +179,7 @@ msgstr ""
 msgid "Edit Brainstorming"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:139
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:124
 #, elixir-autogen, elixir-format
 msgid "Export"
 msgstr ""
@@ -212,42 +212,32 @@ msgstr ""
 msgid "Administration for brainstorming: %{name}"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:67
-#, elixir-autogen, elixir-format
-msgid "Show brainstorming settings link for all users"
-msgstr ""
-
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:71
-#, elixir-autogen, elixir-format
-msgid "Warning: Please make sure you save the admin link at the top, before hiding the settings link!"
-msgstr ""
-
 #: lib/mindwendel_web/controllers/static_page_html/home.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Brainstormings will be deleted after %{days} days."
 msgstr ""
 
-#: lib/mindwendel/brainstormings/brainstorming.ex:75
+#: lib/mindwendel/brainstormings/brainstorming.ex:73
 #, elixir-autogen, elixir-format
 msgid "cyan"
 msgstr ""
 
-#: lib/mindwendel/brainstormings/brainstorming.ex:76
+#: lib/mindwendel/brainstormings/brainstorming.ex:74
 #, elixir-autogen, elixir-format
 msgid "gray dark"
 msgstr ""
 
-#: lib/mindwendel/brainstormings/brainstorming.ex:77
+#: lib/mindwendel/brainstormings/brainstorming.ex:75
 #, elixir-autogen, elixir-format
 msgid "green"
 msgstr ""
 
-#: lib/mindwendel/brainstormings/brainstorming.ex:78
+#: lib/mindwendel/brainstormings/brainstorming.ex:76
 #, elixir-autogen, elixir-format
 msgid "red"
 msgstr ""
 
-#: lib/mindwendel/brainstormings/brainstorming.ex:79
+#: lib/mindwendel/brainstormings/brainstorming.ex:77
 #, elixir-autogen, elixir-format
 msgid "yellow"
 msgstr ""
@@ -281,17 +271,17 @@ msgstr "Share"
 msgid "Share brainstorming"
 msgstr "Share brainstorming"
 
-#: lib/mindwendel_web/live/brainstorming_live/share_component.html.heex:65
+#: lib/mindwendel_web/live/brainstorming_live/share_component.html.heex:79
 #, elixir-autogen, elixir-format
 msgid "Download as png"
 msgstr "Download as png"
 
-#: lib/mindwendel_web/live/brainstorming_live/share_component.html.heex:54
+#: lib/mindwendel_web/live/brainstorming_live/share_component.html.heex:68
 #, elixir-autogen, elixir-format
 msgid "Download as svg"
 msgstr "Download as svg"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:194
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:179
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Brainstorming delete are you sure"
 msgstr "Are you sure that you want to delete this brainstorming?"
@@ -301,18 +291,18 @@ msgstr "Are you sure that you want to delete this brainstorming?"
 msgid "Update idea"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:163
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:148
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Attention: This will delete all ideas in this brainstorming. The brainstorming itself and labels will be left unchanged. This cant be undone."
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:171
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:156
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Brainstorming will be emptied - are you sure"
 msgstr "Are you sure that you want to delete this brainstorming?"
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:157
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:173
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:142
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:158
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Empty brainstorming"
 msgstr ""
@@ -327,7 +317,7 @@ msgstr ""
 msgid "Attention: Brainstormings will be deleted %{available_until} after last access!"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:81
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Allow users to change the order of ideas"
 msgstr "Allow users to change the order of ideas"
@@ -337,7 +327,7 @@ msgstr "Allow users to change the order of ideas"
 msgid "Back"
 msgstr ""
 
-#: lib/mindwendel_web/components/core_components.ex:514
+#: lib/mindwendel_web/components/core_components.ex:522
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
@@ -378,32 +368,32 @@ msgstr ""
 msgid "close"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:129
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:114
 #, elixir-autogen, elixir-format
 msgid "Add idea label"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:101
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:86
 #, elixir-autogen, elixir-format
 msgid "Choose the label color"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:90
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:75
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit Brainstorming Labels"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:117
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:102
 #, elixir-autogen, elixir-format
 msgid "Remove idea label"
 msgstr ""
 
-#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:109
+#: lib/mindwendel_web/live/admin/brainstorming_live/edit.html.heex:94
 #, elixir-autogen, elixir-format
 msgid "Type the label name"
 msgstr ""
 
-#: lib/mindwendel_web/live/brainstorming_live/show.ex:155
+#: lib/mindwendel_web/live/brainstorming_live/show.ex:162
 #, elixir-autogen, elixir-format, fuzzy
 msgid "%{name} - New Lane"
 msgstr ""
@@ -574,3 +564,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Idea details"
 msgstr ""
+
+#: lib/mindwendel_web/live/brainstorming_live/share_component.html.heex:43
+#, elixir-autogen, elixir-format
+msgid "Give moderating permissions"
+msgstr ""
diff --git a/priv/repo/data_migrations/migrate_idea_labels.exs b/priv/repo/data_migrations/migrate_idea_labels.exs
deleted file mode 100644
index c3dab962..00000000
--- a/priv/repo/data_migrations/migrate_idea_labels.exs
+++ /dev/null
@@ -1,139 +0,0 @@
-defmodule Mindwendel.Repo.DataMigrations.MigrateIdealLabels do
-  import Ecto.Query
-  import Ecto.Changeset
-  use Gettext, backend: MindwendelWeb.Gettext
-
-  alias Mindwendel.Repo
-
-  defmodule IdeaLabel do
-    use Mindwendel.Schema
-
-    alias Mindwendel.Brainstormings.Brainstorming
-
-    schema "idea_labels" do
-      field :name, :string
-      field :color, :string
-      field :position_order, :integer
-
-      belongs_to :brainstorming, Brainstorming, foreign_key: :brainstorming_id, type: :binary_id
-
-      timestamps()
-    end
-  end
-
-  defmodule Brainstorming do
-    use Mindwendel.Schema
-    use Gettext, backend: MindwendelWeb.Gettext
-
-    alias Mindwendel.Repo.DataMigrations.MigrateIdealLabels.IdeaLabel
-
-    schema "brainstormings" do
-      field :name, :string
-      field :option_show_link_to_settings, :boolean
-
-      has_many :labels, IdeaLabel
-
-      timestamps()
-    end
-
-    def idea_label_factory do
-      [
-        %IdeaLabel{name: gettext("cyan"), color: "#0dcaf0", position_order: 0},
-        %IdeaLabel{name: gettext("gray dark"), color: "#343a40", position_order: 1},
-        %IdeaLabel{name: gettext("green"), color: "#198754", position_order: 2},
-        %IdeaLabel{name: gettext("red"), color: "#dc3545", position_order: 3},
-        %IdeaLabel{name: gettext("yellow"), color: "#ffc107", position_order: 4}
-      ]
-    end
-  end
-
-  defmodule Idea do
-    use Mindwendel.Schema
-
-    alias Mindwendel.Repo.DataMigrations.MigrateIdealLabels.Brainstorming
-
-    @label_values [:label_1, :label_2, :label_3, :label_4, :label_5]
-
-    schema "ideas" do
-      field :deprecated_label, Ecto.Enum, source: :label, values: @label_values
-      belongs_to :brainstorming, Brainstorming, foreign_key: :brainstorming_id, type: :binary_id
-      belongs_to :label, IdeaLabel, foreign_key: :label_id, type: :binary_id, on_replace: :nilify
-
-      timestamps()
-    end
-  end
-
-  @deprecated_label_to_idea_label_name_mapping %{
-    label_1: gettext("cyan"),
-    label_2: gettext("gray dark"),
-    label_3: gettext("green"),
-    label_4: gettext("red"),
-    label_5: gettext("yellow")
-  }
-
-  def run do
-    prepare_labels_for_brainstormings()
-
-    migrate_labels_from_ideas()
-  end
-
-  def prepare_labels_for_brainstormings do
-    Repo.transaction(fn ->
-      # Note: This following code works, but will load the query result into memory. This can cause problems on larger databases.
-      # We should be ok considering that it is a relatively new project.
-      from(Brainstorming, preload: [:labels])
-      |> Repo.all()
-      |> Enum.each(&migrate_labels_to_idea_labels/1)
-
-      # This could be a better solution as it does not require to load the content query into memory.
-      # Unfortunetaly, Repo.stream/1 does not allow preloads. You would need to map the data structure yourself.
-      #
-      # query = from(Brainstorming, preload: [:labels])
-      # stream = Repo.stream(query)
-      # Repo.transaction(fn() ->
-      #   Enum.each(stream, &migrate_labels_to_idea_labels/1)
-      # end)
-    end)
-  end
-
-  def migrate_labels_from_ideas do
-    Repo.transaction(fn ->
-      from(Idea,
-        preload: [:label, brainstorming: [:labels]],
-        select: [:deprecated_label, :brainstorming_id, :label_id, :id]
-      )
-      |> Repo.all()
-      |> Enum.each(&migrate_label_to_idea_label/1)
-    end)
-  end
-
-  def deprecated_label_to_idea_label_name_for(deprecated_label) do
-    @deprecated_label_to_idea_label_name_mapping[deprecated_label]
-  end
-
-  def deprecated_label_to_idea_label_name_mapping,
-    do: @deprecated_label_to_idea_label_name_mapping
-
-  defp migrate_labels_to_idea_labels(%Brainstorming{} = brainstorming) do
-    new_labels = (brainstorming.labels ++ Brainstorming.idea_label_factory()) |> Enum.slice(0..4)
-
-    change(brainstorming)
-    |> put_assoc(:labels, new_labels)
-    |> Repo.update()
-  end
-
-  defp migrate_label_to_idea_label(%Idea{} = idea) do
-    unless idea.label do
-      idea_label_name = deprecated_label_to_idea_label_name_for(idea.deprecated_label)
-
-      idea_label =
-        Enum.find(idea.brainstorming.labels, fn idea_label ->
-          idea_label.name == idea_label_name
-        end)
-
-      change(idea)
-      |> put_assoc(:label, idea_label)
-      |> Repo.update()
-    end
-  end
-end
diff --git a/priv/repo/data_migrations/migrate_idea_labels_to_idea_idea_labels.exs b/priv/repo/data_migrations/migrate_idea_labels_to_idea_idea_labels.exs
deleted file mode 100644
index 326c426b..00000000
--- a/priv/repo/data_migrations/migrate_idea_labels_to_idea_idea_labels.exs
+++ /dev/null
@@ -1,31 +0,0 @@
-defmodule Mindwendel.Repo.DataMigrations.MigrateIdeaLabelsToIdeaIdeaLabels do
-  require Logger
-
-  def run do
-    try do
-      Ecto.Adapters.SQL.query!(Mindwendel.Repo, migration_sql())
-    rescue
-      e in Postgrex.Error ->
-        Logger.error("""
-        An error occured when executing the migration script.
-        Please ensure the table idea_idea_labels is created and empty before executing this migration
-        script.
-        """)
-
-        Logger.error(Exception.format(:error, e, __STACKTRACE__))
-
-        reraise e, __STACKTRACE__
-    end
-  end
-
-  defp migration_sql do
-    """
-    INSERT INTO idea_idea_labels (idea_id, idea_label_id, inserted_at, updated_at)
-    (
-      SELECT id, label_id, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP
-      FROM ideas
-      WHERE label_id IS NOT NULL
-    );
-    """
-  end
-end
diff --git a/priv/repo/migrations/20210314114416_execute_migrate_idea_labels.exs b/priv/repo/migrations/20210314114416_execute_migrate_idea_labels.exs
index 9506915c..229a1a01 100644
--- a/priv/repo/migrations/20210314114416_execute_migrate_idea_labels.exs
+++ b/priv/repo/migrations/20210314114416_execute_migrate_idea_labels.exs
@@ -1,13 +1,11 @@
 defmodule Mindwendel.Repo.Migrations.ExecuteMigrateIdeaLabels do
-  # Remember to always use a relative file to the priv directory of the elixir app.
-  # Therefore, we are using `:code.priv_dir(:mindwendel)`
-  # See https://elixirforum.com/t/handling-relative-paths-inside-my-mix-project/28974
-  Code.require_file("#{:code.priv_dir(:mindwendel)}/repo/data_migrations/migrate_idea_labels.exs")
-
   use Ecto.Migration
 
+  # There used to be code here, but the migration is so old it's not worth keeping significant code
+  # and its tests around. No one needs a 2 year+ old data migration, or so I hope.
+  # However, the migration already ran/is saved in the `schema_migrations` so removing it would also
+  # be confusing. Hence, it's kept empty.
   def up do
-    Mindwendel.Repo.DataMigrations.MigrateIdealLabels.run()
   end
 
   # We do nothing here
diff --git a/priv/repo/migrations/20220220162733_migrate_idea_labels_to_idea_idea_labels.exs b/priv/repo/migrations/20220220162733_migrate_idea_labels_to_idea_idea_labels.exs
index 9e3f0c82..a6178e77 100644
--- a/priv/repo/migrations/20220220162733_migrate_idea_labels_to_idea_idea_labels.exs
+++ b/priv/repo/migrations/20220220162733_migrate_idea_labels_to_idea_idea_labels.exs
@@ -1,15 +1,11 @@
 defmodule Mindwendel.Repo.Migrations.MigrateIdeaLabelsToIdeaIdeaLabels do
-  # Remember to always use a relative file to the priv directory of the elixir app.
-  # Therefore, we are using `:code.priv_dir(:mindwendel)`
-  # See https://elixirforum.com/t/handling-relative-paths-inside-my-mix-project/28974
-  Code.require_file(
-    "#{:code.priv_dir(:mindwendel)}/repo/data_migrations/migrate_idea_labels_to_idea_idea_labels.exs"
-  )
-
   use Ecto.Migration
 
+  # There used to be code here, but the migration is so old it's not worth keeping significant code
+  # and its tests around. No one needs a 2 year+ old data migration, or so I hope.
+  # However, the migration already ran/is saved in the `schema_migrations` so removing it would also
+  # be confusing. Hence, it's kept empty.
   def up do
-    Mindwendel.Repo.DataMigrations.MigrateIdeaLabelsToIdeaIdeaLabels.run()
   end
 
   # We do nothing here
diff --git a/priv/repo/migrations/20241113091936_remove_unused_label_fields.exs b/priv/repo/migrations/20241113091936_remove_unused_label_fields.exs
new file mode 100644
index 00000000..8cd8c704
--- /dev/null
+++ b/priv/repo/migrations/20241113091936_remove_unused_label_fields.exs
@@ -0,0 +1,10 @@
+defmodule Mindwendel.Repo.Migrations.RemoveUnusedLabelFields do
+  use Ecto.Migration
+
+  def change do
+    alter table(:ideas) do
+      remove :label, :text
+      remove :label_id, references(:idea_labels, type: :uuid)
+    end
+  end
+end
diff --git a/test/mindwendel/accounts_test.exs b/test/mindwendel/accounts_test.exs
index a227edd4..d8e067ef 100644
--- a/test/mindwendel/accounts_test.exs
+++ b/test/mindwendel/accounts_test.exs
@@ -2,14 +2,54 @@ defmodule Mindwendel.AccountsTest do
   use Mindwendel.DataCase, async: true
   alias Mindwendel.Factory
   alias Mindwendel.Accounts
+  alias Mindwendel.Brainstormings
   alias Mindwendel.Accounts.User
   alias Mindwendel.Accounts.BrainstormingUser
+  alias Mindwendel.Accounts.BrainstormingModeratingUser
   alias Mindwendel.Brainstormings.Brainstorming
 
   import ExUnit.CaptureLog
 
   setup do
-    %{user: Factory.insert!(:user)}
+    user = Factory.insert!(:user)
+    brainstorming = Factory.insert!(:brainstorming)
+
+    %{
+      brainstorming: brainstorming,
+      user: user
+    }
+  end
+
+  describe "#add_moderating_user" do
+    test "adds a moderating user to the brainstorming", %{
+      brainstorming: brainstorming,
+      user: %User{id: user_id} = user
+    } do
+      Accounts.add_moderating_user(brainstorming, user)
+
+      assert 1 = Repo.one(from(bmu in BrainstormingModeratingUser, select: count(bmu.user_id)))
+      assert brainstorming_moderatoring_user = Repo.one(BrainstormingModeratingUser)
+      assert brainstorming_moderatoring_user.user_id == user.id
+      assert brainstorming_moderatoring_user.brainstorming_id == brainstorming.id
+
+      assert [%User{id: ^user_id}] =
+               Brainstormings.get_brainstorming!(brainstorming.id).moderating_users
+    end
+
+    test "responds with an error when brainstorming already contains the moderating user", %{
+      brainstorming: brainstorming,
+      user: user
+    } do
+      Accounts.add_moderating_user(brainstorming, user)
+
+      assert {:error,
+              %Ecto.Changeset{
+                valid?: false,
+                errors: [
+                  brainstorming_id: {_, [{:constraint, :unique}, _]}
+                ]
+              }} = Accounts.add_moderating_user(brainstorming, user)
+    end
   end
 
   describe "get_or_create_user" do
@@ -31,7 +71,7 @@ defmodule Mindwendel.AccountsTest do
 
   describe "get_user" do
     test "returns user when it exists", %{user: existing_user} do
-      assert existing_user |> Repo.preload(:brainstormings) ==
+      assert existing_user |> Repo.preload([:brainstormings, :moderated_brainstormings]) ==
                Accounts.get_user(existing_user.id)
     end
 
@@ -54,11 +94,13 @@ defmodule Mindwendel.AccountsTest do
         |> Repo.preload(:users)
 
       old_user = Factory.insert!(:user, updated_at: ~N[2021-01-01 10:00:00])
-      Accounts.merge_brainstorming_user(old_brainstorming, old_user.id)
+
+      updated_old_brainstorming =
+        Accounts.merge_brainstorming_user(old_brainstorming, old_user.id)
 
       %{
         old_user: old_user,
-        old_brainstorming: old_brainstorming
+        old_brainstorming: updated_old_brainstorming
       }
     end
 
diff --git a/test/mindwendel/brainstormings/create_brainstorming_test.exs b/test/mindwendel/brainstormings/create_brainstorming_test.exs
index ef01512f..a1dc7c5e 100644
--- a/test/mindwendel/brainstormings/create_brainstorming_test.exs
+++ b/test/mindwendel/brainstormings/create_brainstorming_test.exs
@@ -1,6 +1,6 @@
 defmodule Mindwendel.Brainstormings.CreateBrainstormingTest do
   use Mindwendel.DataCase, async: true
-  alias Mindwendel.Brainstormings.BrainstormingModeratingUser
+  alias Mindwendel.Accounts.BrainstormingModeratingUser
   alias Mindwendel.Accounts.BrainstormingUser
   alias Mindwendel.Factory
 
diff --git a/test/mindwendel/brainstormings_test.exs b/test/mindwendel/brainstormings_test.exs
index 18cbd413..d2186dcb 100644
--- a/test/mindwendel/brainstormings_test.exs
+++ b/test/mindwendel/brainstormings_test.exs
@@ -1,7 +1,6 @@
 defmodule Mindwendel.BrainstormingsTest do
   alias Mindwendel.Brainstormings.IdeaIdeaLabel
   use Mindwendel.DataCase, async: true
-  alias Mindwendel.Brainstormings.BrainstormingModeratingUser
   alias Mindwendel.Factory
 
   alias Mindwendel.Brainstormings
@@ -28,6 +27,16 @@ defmodule Mindwendel.BrainstormingsTest do
     }
   end
 
+  describe "validate_admin_secret" do
+    test "returns false if secret is wrong", %{brainstorming: brainstorming} do
+      refute Brainstormings.validate_admin_secret(brainstorming, "wrong")
+    end
+
+    test "returns true if secret is correct", %{brainstorming: brainstorming} do
+      assert Brainstormings.validate_admin_secret(brainstorming, brainstorming.admin_url_id)
+    end
+  end
+
   describe "create_brainstorming" do
     test "creates a lane", %{user: user} do
       {:ok, brainstorming} = Brainstormings.create_brainstorming(user, %{name: "test"})
@@ -56,38 +65,6 @@ defmodule Mindwendel.BrainstormingsTest do
     end
   end
 
-  describe "#add_moderating_user" do
-    test "adds a moderating user to the brainstorming", %{
-      brainstorming: brainstorming,
-      user: %User{id: user_id} = user
-    } do
-      Brainstormings.add_moderating_user(brainstorming, user)
-
-      assert 1 = Repo.one(from(bmu in BrainstormingModeratingUser, select: count(bmu.user_id)))
-      assert brainstorming_moderatoring_user = Repo.one(BrainstormingModeratingUser)
-      assert brainstorming_moderatoring_user.user_id == user.id
-      assert brainstorming_moderatoring_user.brainstorming_id == brainstorming.id
-
-      brainstorming = Repo.preload(brainstorming, :moderating_users)
-      assert [%User{id: ^user_id}] = brainstorming.moderating_users
-    end
-
-    test "responds with an error when brainstorming already contains the moderating user", %{
-      brainstorming: brainstorming,
-      user: user
-    } do
-      Brainstormings.add_moderating_user(brainstorming, user)
-
-      assert {:error,
-              %Ecto.Changeset{
-                valid?: false,
-                errors: [
-                  brainstorming_id: {_, [{:constraint, :unique}, _]}
-                ]
-              }} = Brainstormings.add_moderating_user(brainstorming, user)
-    end
-  end
-
   describe "change brainstorming" do
     test "shortens the brainstorming name if it is too long", %{brainstorming: brainstorming} do
       result =
diff --git a/test/mindwendel/ideas_test.exs b/test/mindwendel/ideas_test.exs
index 21f804d5..1472a517 100644
--- a/test/mindwendel/ideas_test.exs
+++ b/test/mindwendel/ideas_test.exs
@@ -8,8 +8,8 @@ defmodule Mindwendel.IdeasTest do
   setup do
     user = Factory.insert!(:user)
     brainstorming = Factory.insert!(:brainstorming, users: [user])
-    lane = Enum.at(brainstorming.lanes, 0)
-    label_first = Enum.at(brainstorming.labels, 0)
+    lane = List.first(brainstorming.lanes)
+    label_first = List.first(brainstorming.labels)
 
     %{
       brainstorming: brainstorming,
@@ -343,11 +343,13 @@ defmodule Mindwendel.IdeasTest do
       lane: lane,
       idea: idea
     } do
+      [first_label, second_label | _] = brainstorming.labels
+
       second_idea =
         Factory.insert!(:idea,
           brainstorming: brainstorming,
           lane: lane,
-          label: Enum.at(brainstorming.labels, 0),
+          idea_labels: [first_label],
           inserted_at: ~N[2022-01-01 15:06:30]
         )
 
@@ -355,7 +357,7 @@ defmodule Mindwendel.IdeasTest do
         Factory.insert!(:idea,
           brainstorming: brainstorming,
           lane: lane,
-          label: Enum.at(brainstorming.labels, 1),
+          idea_labels: [second_label],
           inserted_at: ~N[2021-01-01 15:06:30]
         )
 
diff --git a/test/mindwendel_web/live/brainstorming_live/show_idea_comment_test.exs b/test/mindwendel_web/live/brainstorming_live/show_idea_comment_test.exs
index e6051df4..39edee39 100644
--- a/test/mindwendel_web/live/brainstorming_live/show_idea_comment_test.exs
+++ b/test/mindwendel_web/live/brainstorming_live/show_idea_comment_test.exs
@@ -1,7 +1,7 @@
 defmodule MindwendelWeb.BrainstormingLive.ShowIdeaCommentTest do
   use MindwendelWeb.ConnCase, async: true
   import Phoenix.LiveViewTest
-  alias Mindwendel.Brainstormings
+  alias Mindwendel.Accounts
 
   alias Mindwendel.Factory
 
@@ -26,7 +26,7 @@ defmodule MindwendelWeb.BrainstormingLive.ShowIdeaCommentTest do
       })
 
     moderating_user = Factory.insert!(:user)
-    Brainstormings.add_moderating_user(brainstorming, moderating_user)
+    Accounts.add_moderating_user(brainstorming, moderating_user)
 
     new_user = Factory.insert!(:user)
 
diff --git a/test/mindwendel_web/live/brainstorming_live/show_idea_delete_test.exs b/test/mindwendel_web/live/brainstorming_live/show_idea_delete_test.exs
index 17b2f763..62c4fde1 100644
--- a/test/mindwendel_web/live/brainstorming_live/show_idea_delete_test.exs
+++ b/test/mindwendel_web/live/brainstorming_live/show_idea_delete_test.exs
@@ -1,7 +1,8 @@
 defmodule MindwendelWeb.BrainstormingLive.ShowIdeaDeleteTest do
   use MindwendelWeb.ConnCase, async: true
+
   import Phoenix.LiveViewTest
-  alias Mindwendel.Brainstormings
+  alias Mindwendel.Accounts
 
   alias Mindwendel.Factory
 
@@ -32,7 +33,7 @@ defmodule MindwendelWeb.BrainstormingLive.ShowIdeaDeleteTest do
     brainstorming: brainstorming
   } do
     moderating_user = Factory.insert!(:user)
-    Brainstormings.add_moderating_user(brainstorming, moderating_user)
+    Accounts.add_moderating_user(brainstorming, moderating_user)
 
     {:ok, show_live_view, _html} =
       conn
diff --git a/test/mindwendel_web/live/brainstorming_live/show_idea_edit_test.exs b/test/mindwendel_web/live/brainstorming_live/show_idea_edit_test.exs
index 317f6b22..4dffffab 100644
--- a/test/mindwendel_web/live/brainstorming_live/show_idea_edit_test.exs
+++ b/test/mindwendel_web/live/brainstorming_live/show_idea_edit_test.exs
@@ -1,7 +1,7 @@
 defmodule MindwendelWeb.BrainstormingLive.ShowIdeaEditTest do
   use MindwendelWeb.ConnCase, async: true
   import Phoenix.LiveViewTest
-  alias Mindwendel.Brainstormings
+  alias Mindwendel.Accounts
   alias Mindwendel.Accounts.User
 
   alias Mindwendel.Factory
@@ -34,7 +34,7 @@ defmodule MindwendelWeb.BrainstormingLive.ShowIdeaEditTest do
     brainstorming: brainstorming,
     user: user
   } do
-    Brainstormings.add_moderating_user(brainstorming, user)
+    Accounts.add_moderating_user(brainstorming, user)
     {:ok, show_live_view, _html} = live(conn, ~p"/brainstormings/#{brainstorming.id}")
 
     assert show_live_view
@@ -75,7 +75,7 @@ defmodule MindwendelWeb.BrainstormingLive.ShowIdeaEditTest do
     idea: idea,
     user: user
   } do
-    Brainstormings.add_moderating_user(brainstorming, user)
+    Accounts.add_moderating_user(brainstorming, user)
 
     {:ok, show_live_view, _html} =
       live(conn, ~p"/brainstormings/#{brainstorming.id}")
@@ -114,7 +114,7 @@ defmodule MindwendelWeb.BrainstormingLive.ShowIdeaEditTest do
     idea: idea
   } do
     moderatoring_user = Factory.insert!(:user)
-    Brainstormings.add_moderating_user(brainstorming, moderatoring_user)
+    Accounts.add_moderating_user(brainstorming, moderatoring_user)
 
     {:ok, show_live_view, _html} =
       conn
@@ -141,7 +141,7 @@ defmodule MindwendelWeb.BrainstormingLive.ShowIdeaEditTest do
     user: %User{id: user_id}
   } do
     moderator_user = Factory.insert!(:user)
-    Brainstormings.add_moderating_user(brainstorming, moderator_user)
+    Accounts.add_moderating_user(brainstorming, moderator_user)
 
     {:ok, show_live_view, _html} =
       conn
diff --git a/test/mindwendel_web/live/brainstorming_live/show_sort_by_label_test.exs b/test/mindwendel_web/live/brainstorming_live/show_sort_by_label_test.exs
index 5c95dad0..e7f32f7a 100644
--- a/test/mindwendel_web/live/brainstorming_live/show_sort_by_label_test.exs
+++ b/test/mindwendel_web/live/brainstorming_live/show_sort_by_label_test.exs
@@ -1,14 +1,14 @@
 defmodule MindwendelWeb.BrainstormingLive.ShowSortByLabelTest do
   use MindwendelWeb.ConnCase, async: true
   import Phoenix.LiveViewTest
-  alias Mindwendel.Brainstormings
+  alias Mindwendel.Accounts
 
   alias Mindwendel.Factory
 
   setup do
     moderating_user = Factory.insert!(:user)
     brainstorming = Factory.insert!(:brainstorming)
-    Brainstormings.add_moderating_user(brainstorming, moderating_user)
+    Accounts.add_moderating_user(brainstorming, moderating_user)
     %{brainstorming: brainstorming, moderating_user: moderating_user}
   end
 
@@ -32,24 +32,27 @@ defmodule MindwendelWeb.BrainstormingLive.ShowSortByLabelTest do
     brainstorming: brainstorming,
     moderating_user: moderating_user
   } do
+    lane = List.first(brainstorming.lanes)
+    [first_label, second_label | _] = brainstorming.labels
+
     idea_with_first_label =
       Factory.insert!(:idea, %{
         brainstorming: brainstorming,
-        label: Enum.at(brainstorming.labels, 0),
-        lane: Enum.at(brainstorming.lanes, 0)
+        idea_labels: [first_label],
+        lane: lane
       })
 
     idea_with_second_label =
       Factory.insert!(:idea, %{
         brainstorming: brainstorming,
-        label: Enum.at(brainstorming.labels, 1),
-        lane: Enum.at(brainstorming.lanes, 0)
+        idea_labels: [second_label],
+        lane: lane
       })
 
     idea_without_label =
       Factory.insert!(:idea, %{
         brainstorming: brainstorming,
-        lane: Enum.at(brainstorming.lanes, 0)
+        lane: lane
       })
 
     {:ok, show_live_view, _html} =
diff --git a/test/mindwendel_web/live/brainstorming_live_test.exs b/test/mindwendel_web/live/brainstorming_live_test.exs
index f41ee26d..6d560c52 100644
--- a/test/mindwendel_web/live/brainstorming_live_test.exs
+++ b/test/mindwendel_web/live/brainstorming_live_test.exs
@@ -2,6 +2,7 @@ defmodule MindwendelWeb.BrainstormingLiveTest do
   use MindwendelWeb.ConnCase, async: true
   import Phoenix.LiveViewTest
 
+  alias Mindwendel.Accounts
   alias Mindwendel.Brainstormings
   alias Mindwendel.Factory
   alias Mindwendel.Brainstormings.Brainstorming
@@ -149,7 +150,7 @@ defmodule MindwendelWeb.BrainstormingLiveTest do
 
     test "enables dragging for admin", %{conn: conn, brainstorming: brainstorming, lane: lane} do
       moderating_user = List.first(brainstorming.users)
-      Brainstormings.add_moderating_user(brainstorming, moderating_user)
+      Accounts.add_moderating_user(brainstorming, moderating_user)
 
       {:ok, view, _html} =
         conn
@@ -191,7 +192,7 @@ defmodule MindwendelWeb.BrainstormingLiveTest do
       brainstorming: brainstorming
     } do
       moderating_user = List.first(brainstorming.users)
-      Brainstormings.add_moderating_user(brainstorming, moderating_user)
+      Accounts.add_moderating_user(brainstorming, moderating_user)
 
       {:ok, view, _html} =
         conn
@@ -241,7 +242,7 @@ defmodule MindwendelWeb.BrainstormingLiveTest do
       brainstorming: brainstorming
     } do
       moderating_user = List.first(brainstorming.users)
-      Brainstormings.add_moderating_user(brainstorming, moderating_user)
+      Accounts.add_moderating_user(brainstorming, moderating_user)
 
       {:ok, view, _html} =
         conn
@@ -257,7 +258,7 @@ defmodule MindwendelWeb.BrainstormingLiveTest do
       lane: lane
     } do
       moderating_user = List.first(brainstorming.users)
-      Brainstormings.add_moderating_user(brainstorming, moderating_user)
+      Accounts.add_moderating_user(brainstorming, moderating_user)
 
       {:ok, view, _html} =
         conn
@@ -289,7 +290,7 @@ defmodule MindwendelWeb.BrainstormingLiveTest do
 
     test "sets a label filter as admin", %{conn: conn, brainstorming: brainstorming} do
       moderating_user = List.first(brainstorming.users)
-      Brainstormings.add_moderating_user(brainstorming, moderating_user)
+      Accounts.add_moderating_user(brainstorming, moderating_user)
       selected_ideal_label = Enum.at(brainstorming.labels, 0)
 
       {:ok, view, _html} =
diff --git a/test/mindwendel_web/live/label_live/captions_test.exs b/test/mindwendel_web/live/label_live/captions_test.exs
index 0a205195..21c6e5d3 100644
--- a/test/mindwendel_web/live/label_live/captions_test.exs
+++ b/test/mindwendel_web/live/label_live/captions_test.exs
@@ -3,6 +3,7 @@ defmodule MindwendelWeb.LabelLive.CaptionsTest do
 
   import Phoenix.LiveViewTest
 
+  alias Mindwendel.Accounts
   alias Mindwendel.Brainstormings
   alias Mindwendel.Factory
 
@@ -16,20 +17,21 @@ defmodule MindwendelWeb.LabelLive.CaptionsTest do
     brainstorming: brainstorming,
     user: user
   } do
-    preloaded_braisntorming = Brainstormings.get_brainstorming!(brainstorming.id)
+    preloaded_brainstorming = Brainstormings.get_brainstorming!(brainstorming.id)
+    preloaded_user = Accounts.get_user(user.id)
 
     captions_component =
       render_component(CaptionsComponent,
         id: "captions",
-        brainstorming: preloaded_braisntorming,
-        current_user: user
+        brainstorming: preloaded_brainstorming,
+        current_user: preloaded_user
       )
 
     # make sure that there is at least one label in the list:
 
-    assert length(preloaded_braisntorming.labels) > 0
+    assert length(preloaded_brainstorming.labels) > 0
 
-    Enum.each(brainstorming.labels, fn label ->
+    Enum.each(preloaded_brainstorming.labels, fn label ->
       assert captions_component =~ label.name
     end)
   end
diff --git a/test/repo/data_migrations/migrate_idea_labels_test.exs b/test/repo/data_migrations/migrate_idea_labels_test.exs
deleted file mode 100644
index 1262a5d0..00000000
--- a/test/repo/data_migrations/migrate_idea_labels_test.exs
+++ /dev/null
@@ -1,118 +0,0 @@
-defmodule Mindwendel.Repo.DataMigrations.MigrateIdealLabelsTest do
-  Code.require_file("./priv/repo/data_migrations/migrate_idea_labels.exs")
-
-  use Mindwendel.DataCase, async: true
-  alias Mindwendel.Factory
-  alias Mindwendel.Repo
-  alias Mindwendel.Brainstormings.Brainstorming
-  alias Mindwendel.Brainstormings.IdeaLabel
-  alias Mindwendel.Repo.DataMigrations.MigrateIdealLabels
-
-  setup do
-    %{brainstorming: Factory.insert!(:brainstorming, %{labels: []})}
-  end
-
-  describe "#prepare_labels_for_brainstormings/0" do
-    test "adds up to five idea labels for each brainstorming", %{
-      brainstorming: existing_brainstorming
-    } do
-      existing_brainstorming = Repo.preload(existing_brainstorming, :labels)
-      assert Enum.empty?(existing_brainstorming.labels)
-
-      MigrateIdealLabels.run()
-
-      updated_brainstorming = Repo.reload(existing_brainstorming) |> Repo.preload(:labels)
-
-      assert Enum.count(updated_brainstorming.labels) == 5
-    end
-
-    test "considers existing idea_labels and adds up to five idea labels for each brainstorming" do
-      idea_label_1 = %IdeaLabel{name: "idea_label_1", position_order: 7}
-      idea_label_2 = %IdeaLabel{name: "idea_label_2", position_order: 8}
-
-      brainstroming_with_two_labels =
-        %Brainstorming{name: "How to brainstorm ideas?", labels: [idea_label_1, idea_label_2]}
-        |> Repo.insert!()
-
-      assert Enum.count(brainstroming_with_two_labels.labels) == 2
-
-      MigrateIdealLabels.run()
-
-      updated_brainstorming = Repo.reload(brainstroming_with_two_labels) |> Repo.preload(:labels)
-      assert Enum.count(updated_brainstorming.labels) == 5
-
-      assert Enum.map(updated_brainstorming.labels, &Map.take(&1, [:name, :position_order])) == [
-               %{name: idea_label_1.name, position_order: 7},
-               %{name: idea_label_2.name, position_order: 8},
-               %{name: "cyan", position_order: 0},
-               %{name: "gray dark", position_order: 1},
-               %{name: "green", position_order: 2}
-             ]
-    end
-
-    test "does not add additional idea labels when running multiple times", %{
-      brainstorming: existing_brainstorming
-    } do
-      # Running twice
-      MigrateIdealLabels.run()
-      MigrateIdealLabels.run()
-
-      updated_brainstorming = Repo.reload(existing_brainstorming) |> Repo.preload(:labels)
-      assert Enum.count(updated_brainstorming.labels) == 5
-    end
-  end
-
-  describe "#migrate_labels_from_ideas/0" do
-    test "connects idea to its idea label", %{
-      brainstorming: existing_brainstorming
-    } do
-      idea =
-        Factory.build(:idea, deprecated_label: :label_1, brainstorming: existing_brainstorming)
-        |> Repo.insert!()
-
-      MigrateIdealLabels.run()
-
-      updated_idea = Repo.reload(idea) |> Repo.preload([:label, brainstorming: [:labels]])
-
-      assert updated_idea.label.name == "cyan"
-
-      assert Enum.map(updated_idea.brainstorming.labels, & &1.id)
-             |> Enum.member?(updated_idea.label.id)
-    end
-  end
-
-  test "does not override existing label with deprecated_label" do
-    idea_label = Factory.insert!(:idea_label, name: "Topic A")
-    brainstorming = Factory.insert!(:brainstorming, labels: [idea_label])
-
-    idea =
-      Factory.insert!(:idea,
-        deprecated_label: :label_1,
-        label: idea_label,
-        brainstorming: brainstorming
-      )
-
-    MigrateIdealLabels.run()
-
-    updated_idea = Repo.reload(idea) |> Repo.preload([:label, brainstorming: [:labels]])
-    assert updated_idea.label.id == idea_label.id
-    assert updated_idea.label.name == idea_label.name
-
-    updated_brainstorming = Repo.reload(brainstorming) |> Repo.preload([:labels])
-    assert Enum.map(updated_brainstorming.labels, & &1.id) |> Enum.member?(idea_label.id)
-  end
-
-  test "migrate predefined values of field deprecated_label", %{
-    brainstorming: existing_brainstorming
-  } do
-    for {k, v} <- MigrateIdealLabels.deprecated_label_to_idea_label_name_mapping() do
-      idea = Factory.insert!(:idea, deprecated_label: k, brainstorming: existing_brainstorming)
-
-      MigrateIdealLabels.run()
-
-      updated_idea = Repo.reload(idea) |> Repo.preload([:label, brainstorming: [:labels]])
-
-      assert updated_idea.label.name == v
-    end
-  end
-end
diff --git a/test/repo/data_migrations/migrate_idea_labels_to_idea_idea_labels_test.exs b/test/repo/data_migrations/migrate_idea_labels_to_idea_idea_labels_test.exs
deleted file mode 100644
index 5f96ce5b..00000000
--- a/test/repo/data_migrations/migrate_idea_labels_to_idea_idea_labels_test.exs
+++ /dev/null
@@ -1,70 +0,0 @@
-defmodule Mindwendel.Repo.DataMigrations.MigrateIdeaLabelsToIdeaIdeaLabelsTest do
-  Code.require_file("./priv/repo/data_migrations/migrate_idea_labels_to_idea_idea_labels.exs")
-
-  use Mindwendel.DataCase, async: true
-
-  alias Mindwendel.Factory
-  alias Mindwendel.Repo
-  alias Mindwendel.Brainstormings.Idea
-  alias Mindwendel.Brainstormings.IdeaIdeaLabel
-  alias Mindwendel.Repo.DataMigrations.MigrateIdeaLabelsToIdeaIdeaLabels
-
-  setup do
-    brainstorming = Factory.insert!(:brainstorming)
-    brainstorming_label_1 = brainstorming.labels |> Enum.at(1)
-    idea_1 = Factory.insert!(:idea, brainstorming: brainstorming, label: brainstorming_label_1)
-    brainstorming_label_2 = brainstorming.labels |> Enum.at(2)
-    idea_2 = Factory.insert!(:idea, brainstorming: brainstorming, label: brainstorming_label_2)
-
-    %{
-      brainstorming: brainstorming,
-      brainstorming_label_1: brainstorming_label_1,
-      idea_1: idea_1,
-      brainstorming_label_2: brainstorming_label_2,
-      idea_2: idea_2
-    }
-  end
-
-  test "migrates successfully", %{
-    brainstorming: _brainstorming,
-    brainstorming_label_1: brainstorming_label_1,
-    idea_1: idea_1,
-    brainstorming_label_2: brainstorming_label_2,
-    idea_2: idea_2
-  } do
-    assert Repo.all(Idea) |> Enum.count() == 2
-    assert Enum.empty?(Repo.all(IdeaIdeaLabel))
-
-    MigrateIdeaLabelsToIdeaIdeaLabels.run()
-
-    assert Repo.all(IdeaIdeaLabel) |> Enum.count() == 2
-
-    assert from(idea_idea_label in IdeaIdeaLabel,
-             where:
-               idea_idea_label.idea_label_id ==
-                 ^brainstorming_label_1.id and
-                 idea_idea_label.idea_id == ^idea_1.id
-           )
-           |> Repo.one!()
-
-    assert from(idea_idea_label in IdeaIdeaLabel,
-             where:
-               idea_idea_label.idea_label_id ==
-                 ^brainstorming_label_2.id and
-                 idea_idea_label.idea_id == ^idea_2.id
-           )
-           |> Repo.one!()
-  end
-
-  test "fails gracefully", %{
-    brainstorming: _brainstorming,
-    brainstorming_label_1: brainstorming_label_1,
-    idea_1: idea_1,
-    brainstorming_label_2: _brainstorming_label_2,
-    idea_2: _idea_2
-  } do
-    Factory.insert!(:idea_idea_label, idea: idea_1, idea_label: brainstorming_label_1)
-
-    assert_raise Postgrex.Error, fn -> MigrateIdeaLabelsToIdeaIdeaLabels.run() end
-  end
-end
diff --git a/test/support/factory.ex b/test/support/factory.ex
index 1b42926e..50c53451 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -18,7 +18,8 @@ defmodule Mindwendel.Factory do
       # This can be removed as soon the todo is solved in lib/mindwendel/brainstormings/brainstorming.ex:12
       admin_url_id: Ecto.UUID.generate(),
       labels: Brainstorming.idea_label_factory(),
-      lanes: [build(:lane)]
+      lanes: [build(:lane)],
+      moderating_users: []
     }
   end