diff --git a/FoodsharingSiegen.Contracts/Model/AppSettings.cs b/FoodsharingSiegen.Contracts/Model/AppSettings.cs
index 3ce1f23..30bb9d4 100644
--- a/FoodsharingSiegen.Contracts/Model/AppSettings.cs
+++ b/FoodsharingSiegen.Contracts/Model/AppSettings.cs
@@ -4,6 +4,8 @@
     {
         #region Public Properties
 
+        public bool DisableStepIn { get; set; }
+
         public TermSettings Terms { get; set; } = new();
 
         public bool TestMode { get; set; }
diff --git a/FoodsharingSiegen.Server/Controls/ProspectContainer.razor b/FoodsharingSiegen.Server/Controls/ProspectContainer.razor
index 0faba7e..2edda8b 100644
--- a/FoodsharingSiegen.Server/Controls/ProspectContainer.razor
+++ b/FoodsharingSiegen.Server/Controls/ProspectContainer.razor
@@ -51,27 +51,30 @@
         <InteractionRow
             Prospect="Prospect"
             Type="InteractionType.Welcome"
-            AllowInteraction="@(StateFilter == ProspectStateFilter.OnBoarding && CurrentUser.IsInGroup(UserGroup.WelcomeTeam))"
+            AllowInteraction="@(StateFilter == ProspectStateFilter.OnBoarding && CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador))"
             AddClick="AddInteraction"
             RemoveClick="@RemoveInteraction"
             ButtonIconClass="fa-solid fa-check"
             IconClass="fa-solid fa-handshake-simple">
         </InteractionRow>
 
-        <InteractionRow
-            Prospect="Prospect"
-            Type="InteractionType.StepInBriefing"
-            AllowInteraction="@(StateFilter == ProspectStateFilter.OnBoarding && CurrentUser.IsInGroup(UserGroup.WelcomeTeam))"
-            AddClick="AddInteraction"
-            RemoveClick="@RemoveInteraction"
-            ButtonIconClass="fa-solid fa-check"
-            IconClass="fa-solid fa-graduation-cap">
-        </InteractionRow>
+        @if (!AppSettings.DisableStepIn)
+        {
+            <InteractionRow
+                Prospect="Prospect"
+                Type="InteractionType.StepInBriefing"
+                AllowInteraction="@(StateFilter == ProspectStateFilter.OnBoarding && CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador))"
+                AddClick="AddInteraction"
+                RemoveClick="@RemoveInteraction"
+                ButtonIconClass="fa-solid fa-check"
+                IconClass="fa-solid fa-graduation-cap">
+            </InteractionRow>
+        }
 
         <InteractionRow
             Prospect="Prospect"
             Type="InteractionType.EinAb"
-            AllowInteraction="@(StateFilter == ProspectStateFilter.OnBoarding && CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.StoreManager, UserGroup.Ambassador))"
+            AllowInteraction="@(StateFilter == ProspectStateFilter.OnBoarding && CurrentUser.IsInGroup(UserGroup.WelcomeTeam, UserGroup.Ambassador))"
             AddClick="AddInteraction"
             RemoveClick="@RemoveInteraction"
             Multiple="true"
diff --git a/FoodsharingSiegen.Server/Controls/ProspectFilterControl.razor b/FoodsharingSiegen.Server/Controls/ProspectFilterControl.razor
index 535adfe..00c9455 100644
--- a/FoodsharingSiegen.Server/Controls/ProspectFilterControl.razor
+++ b/FoodsharingSiegen.Server/Controls/ProspectFilterControl.razor
@@ -54,12 +54,15 @@
   </div>
   <div class="card-body" style="padding: .5rem;">
     
-    @* WITHOUT STEP IN BRIEFING *@
-    @if (new[] { ProspectStateFilter.All, ProspectStateFilter.OnBoarding, ProspectStateFilter.Completed }.Contains(StateFilter))
+    @if (!AppSettings.DisableStepIn)
     {
-      <div style="margin-left: 1rem;">
-        <Switch TValue="bool" Checked="Filter.WithoutStepInBriefing" CheckedChanged="WithoutStepInBriefingChangedAsync" Color="Color.Primary">Ohne @AppSettings.Terms.StepInName</Switch>
-      </div>
+      @* WITHOUT STEP IN BRIEFING *@
+      @if (new[] { ProspectStateFilter.All, ProspectStateFilter.OnBoarding, ProspectStateFilter.Completed }.Contains(StateFilter))
+      {
+        <div style="margin-left: 1rem;">
+          <Switch TValue="bool" Checked="Filter.WithoutStepInBriefing" CheckedChanged="WithoutStepInBriefingChangedAsync" Color="Color.Primary">Ohne @AppSettings.Terms.StepInName</Switch>
+        </div>
+      }
     }
 
     @* WITHOUT ID CHECK *@