diff --git a/server/src/service/business/checkService.ts b/server/src/service/business/checkService.ts
index 8779b0a00..c83a3d411 100644
--- a/server/src/service/business/checkService.ts
+++ b/server/src/service/business/checkService.ts
@@ -194,4 +194,3 @@ export class CheckService implements ICheckService {
 		throw new AppError({ message: "Not implemented", service: SERVICE_NAME, method: "updateChecksTTL", status: 500, details: { teamId, ttl } });
 	};
 }
-
diff --git a/server/src/service/business/diagnosticService.ts b/server/src/service/business/diagnosticService.ts
index f7a8b8ff9..f9c53f633 100644
--- a/server/src/service/business/diagnosticService.ts
+++ b/server/src/service/business/diagnosticService.ts
@@ -107,4 +107,3 @@ export class DiagnosticService implements IDiagnosticService {
 		return diagnostics;
 	};
 }
-
diff --git a/server/src/service/business/geoChecksService.ts b/server/src/service/business/geoChecksService.ts
index 5c5869d94..4a31348b0 100644
--- a/server/src/service/business/geoChecksService.ts
+++ b/server/src/service/business/geoChecksService.ts
@@ -188,4 +188,3 @@ export class GeoChecksService implements IGeoChecksService {
 		return result;
 	};
 }
-
diff --git a/server/src/service/business/incidentService.ts b/server/src/service/business/incidentService.ts
index 81a98893a..710336016 100644
--- a/server/src/service/business/incidentService.ts
+++ b/server/src/service/business/incidentService.ts
@@ -266,4 +266,3 @@ export class IncidentService implements IIncidentService {
 		}
 	};
 }
-
diff --git a/server/src/service/business/inviteService.ts b/server/src/service/business/inviteService.ts
index 26b3b9dbe..9d1cbf59d 100644
--- a/server/src/service/business/inviteService.ts
+++ b/server/src/service/business/inviteService.ts
@@ -94,4 +94,3 @@ export class InviteService implements IInviteService {
 		return await this.invitesRepository.findByToken(inviteToken);
 	};
 }
-
diff --git a/server/src/service/business/maintenanceWindowService.ts b/server/src/service/business/maintenanceWindowService.ts
index 2257718f3..abf513eb5 100644
--- a/server/src/service/business/maintenanceWindowService.ts
+++ b/server/src/service/business/maintenanceWindowService.ts
@@ -96,4 +96,3 @@ export class MaintenanceWindowService implements IMaintenanceWindowService {
 		return await this.maintenanceWindowsRepository.updateById(id, teamId, body);
 	};
 }
-
diff --git a/server/src/service/business/userService.ts b/server/src/service/business/userService.ts
index fde9d6292..7cd1491c3 100644
--- a/server/src/service/business/userService.ts
+++ b/server/src/service/business/userService.ts
@@ -141,7 +141,7 @@ export class UserService implements IUserService {
 			message: "New user created",
 			service: SERVICE_NAME,
 			method: "registerUser",
-			details: newUser.id,
+			details: { userId: newUser.id },
 		});
 
 		delete newUser.profileImage;
@@ -205,7 +205,7 @@ export class UserService implements IUserService {
 			message: "New user created by superadmin",
 			service: SERVICE_NAME,
 			method: "createUser",
-			details: newUser.id,
+			details: { userId: newUser.id },
 		});
 
 		newUser.profileImage = undefined;
@@ -280,6 +280,14 @@ export class UserService implements IUserService {
 			email,
 			url,
 		});
+		if (!html) {
+			throw new AppError({
+				message: "Failed to build password reset email HTML",
+				service: SERVICE_NAME,
+				method: "requestRecovery",
+				status: 500,
+			});
+		}
 		const msgId = await this.emailService.sendEmail(email, "Checkmate Password Reset", html);
 		return msgId;
 	};
diff --git a/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.ts b/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.ts
index 216a821b1..2857f5b82 100644
--- a/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.ts
+++ b/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.ts
@@ -289,4 +289,3 @@ export class SuperSimpleQueue implements ISuperSimpleQueue {
 		});
 	};
 }
-
diff --git a/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.ts b/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.ts
index 11a44d1bd..011008b32 100644
--- a/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.ts
+++ b/server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.ts
@@ -412,4 +412,3 @@ export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 		return decision;
 	}
 }
-
diff --git a/server/src/service/infrastructure/bufferService.ts b/server/src/service/infrastructure/bufferService.ts
index ae89a1c09..229c5e7d4 100755
--- a/server/src/service/infrastructure/bufferService.ts
+++ b/server/src/service/infrastructure/bufferService.ts
@@ -177,4 +177,3 @@ export class BufferService implements IBufferService {
 		}
 	}
 }
-
diff --git a/server/src/service/infrastructure/emailService.ts b/server/src/service/infrastructure/emailService.ts
index 180a728f3..f536f3f18 100755
--- a/server/src/service/infrastructure/emailService.ts
+++ b/server/src/service/infrastructure/emailService.ts
@@ -178,4 +178,3 @@ export class EmailService implements IEmailService {
 		}
 	};
 }
-
diff --git a/server/src/service/infrastructure/globalPingService.ts b/server/src/service/infrastructure/globalPingService.ts
index 0a65412f4..b58486ad3 100644
--- a/server/src/service/infrastructure/globalPingService.ts
+++ b/server/src/service/infrastructure/globalPingService.ts
@@ -206,4 +206,3 @@ export class GlobalPingService implements IGlobalPingService {
 		return new Promise((resolve) => setTimeout(resolve, ms));
 	}
 }
-
diff --git a/server/src/service/infrastructure/networkService.ts b/server/src/service/infrastructure/networkService.ts
index a459c6480..e475bc24b 100644
--- a/server/src/service/infrastructure/networkService.ts
+++ b/server/src/service/infrastructure/networkService.ts
@@ -197,4 +197,3 @@ export class NetworkService implements INetworkService {
 		}
 	}
 }
-
diff --git a/server/src/service/system/settingsService.ts b/server/src/service/system/settingsService.ts
index 46959c554..1d75c0a36 100755
--- a/server/src/service/system/settingsService.ts
+++ b/server/src/service/system/settingsService.ts
@@ -74,4 +74,3 @@ export class SettingsService implements ISettingsService {
 		return settings;
 	};
 }
-