diff --git a/client/src/Pages/Notifications/create/index.jsx b/client/src/Pages/Notifications/create/index.jsx
index 10c280efb..6d8afe665 100644
--- a/client/src/Pages/Notifications/create/index.jsx
+++ b/client/src/Pages/Notifications/create/index.jsx
@@ -89,8 +89,6 @@ const CreateNotifications = () => {
 			error.details.forEach((err) => {
 				newErrors[err.path[0]] = err.message;
 			});
-			console.log(JSON.stringify(newErrors));
-			console.log(JSON.stringify(form, null, 2));
 			createToast({ body: Object.values(newErrors)[0] });
 			setErrors(newErrors);
 			return;
diff --git a/client/src/Pages/Notifications/utils.js b/client/src/Pages/Notifications/utils.js
index 7ef6e5a60..0813f6868 100644
--- a/client/src/Pages/Notifications/utils.js
+++ b/client/src/Pages/Notifications/utils.js
@@ -9,7 +9,7 @@ export const NOTIFICATION_TYPES = [
 export const TITLE_MAP = {
 	email: "createNotifications.emailSettings.title",
 	slack: "createNotifications.slackSettings.title",
-	pager_duty: "createNotifications.pagerDutySettings.title",
+	pager_duty: "createNotifications.pagerdutySettings.title",
 	webhook: "createNotifications.webhookSettings.title",
 	discord: "createNotifications.discordSettings.title",
 };
@@ -17,7 +17,7 @@ export const TITLE_MAP = {
 export const DESCRIPTION_MAP = {
 	email: "createNotifications.emailSettings.description",
 	slack: "createNotifications.slackSettings.description",
-	pager_duty: "createNotifications.pagerDutySettings.description",
+	pager_duty: "createNotifications.pagerdutySettings.description",
 	webhook: "createNotifications.webhookSettings.description",
 	discord: "createNotifications.discordSettings.description",
 };
@@ -25,7 +25,7 @@ export const DESCRIPTION_MAP = {
 export const LABEL_MAP = {
 	email: "createNotifications.emailSettings.emailLabel",
 	slack: "createNotifications.slackSettings.webhookLabel",
-	pager_duty: "createNotifications.pagerDutySettings.integrationKeyLabel",
+	pager_duty: "createNotifications.pagerdutySettings.integrationKeyLabel",
 	webhook: "createNotifications.webhookSettings.webhookLabel",
 	discord: "createNotifications.discordSettings.webhookLabel",
 };
@@ -33,7 +33,7 @@ export const LABEL_MAP = {
 export const PLACEHOLDER_MAP = {
 	email: "createNotifications.emailSettings.emailPlaceholder",
 	slack: "createNotifications.slackSettings.webhookPlaceholder",
-	pager_duty: "createNotifications.pagerDutySettings.integrationKeyPlaceholder",
+	pager_duty: "createNotifications.pagerdutySettings.integrationKeyPlaceholder",
 	webhook: "createNotifications.webhookSettings.webhookPlaceholder",
 	discord: "createNotifications.discordSettings.webhookPlaceholder",
 };
diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index de248f87b..c778efc9e 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -439,21 +439,35 @@ const notificationValidation = joi.object({
 		}),
 
 	address: joi.when("type", {
-		is: "email",
-		then: joi
-			.string()
-			.email({ tlds: { allow: false } })
-			.required()
-			.messages({
-				"string.empty": "E-mail address cannot be empty",
-				"any.required": "E-mail address is required",
-				"string.email": "Please enter a valid e-mail address",
-			}),
-		otherwise: joi.string().uri().required().messages({
-			"string.empty": "Webhook URL cannot be empty",
-			"any.required": "Webhook URL is required",
-			"string.uri": "Please enter a valid Webhook URL",
-		}),
+		switch: [
+			{
+				is: "email",
+				then: joi
+					.string()
+					.email({ tlds: { allow: false } })
+					.required()
+					.messages({
+						"string.empty": "E-mail address cannot be empty",
+						"any.required": "E-mail address is required",
+						"string.email": "Please enter a valid e-mail address",
+					}),
+			},
+			{
+				is: "pager_duty",
+				then: joi.string().required().messages({
+					"string.empty": "PagerDuty routing key cannot be empty",
+					"any.required": "PagerDuty routing key is required",
+				}),
+			},
+			{
+				is: joi.valid("webhook", "slack", "discord"),
+				then: joi.string().uri().required().messages({
+					"string.empty": "Webhook URL cannot be empty",
+					"any.required": "Webhook URL is required",
+					"string.uri": "Please enter a valid Webhook URL",
+				}),
+			},
+		],
 	}),
 });