diff --git a/apps/dispatch/app/dispatch/_components/map/_components/MissionMarkerTabs.tsx b/apps/dispatch/app/dispatch/_components/map/_components/MissionMarkerTabs.tsx
index 45cc1f9d..d8be0756 100644
--- a/apps/dispatch/app/dispatch/_components/map/_components/MissionMarkerTabs.tsx
+++ b/apps/dispatch/app/dispatch/_components/map/_components/MissionMarkerTabs.tsx
@@ -162,14 +162,45 @@ const Einsatzdetails = ({ mission }: { mission: Mission }) => {
 			{mission.state === "draft" && (
 				<div>
 					<div className="divider mt-0 mb-0" />
+
+					<div className="form-control mb-2">
+						<label className="flex items-center gap-2 cursor-pointer">
+							<input
+								type="checkbox"
+								className="checkbox checkbox-sm checkbox-primary"
+							/>
+							<span className="label-text font-semibold leading-6">
+								Ohne HPG-Mission alarmieren
+							</span>
+						</label>
+					</div>
+
 					<div className="flex items-center gap-2 w-full">
-						<button
+						{/* <button
 							className="btn btn-sm btn-info btn-outline flex-3"
 							onClick={() => sendAlertMutation.mutate(mission.id)}
 						>
 							<span className="flex items-center gap-2">
 								<BellRing size={16} /> Alarmieren
 							</span>
+						</button> */}
+						{/* <button
+							className="btn btn-sm btn-info btn-outline flex-3"
+							onClick={() => sendAlertMutation.mutate(mission.id)}
+							disabled
+						>
+							<span className="flex items-center gap-2">
+								<span className="loading loading-spinner loading-md"></span>{" "}
+								HPG-Validierung läuft...
+							</span>
+						</button> */}
+						<button
+							className="btn btn-sm btn-warning btn-outline flex-3"
+							onClick={() => sendAlertMutation.mutate(mission.id)}
+						>
+							<span className="flex items-center gap-2">
+								<BellRing size={16} /> Mit neuer Position alarmieren
+							</span>
 						</button>
 
 						<button
diff --git a/apps/dispatch/app/dispatch/_components/pannel/MissionForm.tsx b/apps/dispatch/app/dispatch/_components/pannel/MissionForm.tsx
index 6ec9ed21..27fbf02f 100644
--- a/apps/dispatch/app/dispatch/_components/pannel/MissionForm.tsx
+++ b/apps/dispatch/app/dispatch/_components/pannel/MissionForm.tsx
@@ -272,26 +272,36 @@ export const MissionForm = () => {
 									))}
 						</select>
 						{/* TODO: Nur anzeigen wenn eine Station mit HPG ausgewählt ist */}
-						<select
-							{...form.register("hpgMissionString")}
-							className="select select-primary select-bordered w-full mb-4"
-							defaultValue="default"
-						>
-							<option disabled value="">
-								Einsatz Szenerie auswählen...
-							</option>
-							{keywords &&
-								keywords
-									.find((k) => k.name === form.watch("missionKeywordName"))
-									?.hpgMissionTypes?.map((missionString) => {
-										const [name] = missionString.split(":");
-										return (
-											<option key={missionString} value={missionString}>
-												{name}
-											</option>
-										);
-									})}
-						</select>
+						<div className="mb-4">
+							<select
+								{...form.register("hpgMissionString")}
+								className="select select-primary select-bordered w-full"
+								defaultValue="default"
+							>
+								<option disabled value="">
+									Einsatz Szenario auswählen...
+								</option>
+								{keywords &&
+									keywords
+										.find((k) => k.name === form.watch("missionKeywordName"))
+										?.hpgMissionTypes?.map((missionString) => {
+											const [name] = missionString.split(":");
+											return (
+												<option key={missionString} value={missionString}>
+													{name}
+												</option>
+											);
+										})}
+							</select>
+							{form.watch("hpgMissionString") &&
+								form.watch("hpgMissionString") !== "" && (
+									<p className="text-sm text-error">
+										Szenario wird vor Alarmierung HPG-Validiert. <br />
+										Achte nach dem Vorbereiten / Alarmieren auf den Status der
+										Mission.
+									</p>
+								)}
+						</div>
 					</>
 				)}
 				<textarea