diff --git a/src/common/emails/EmailBuilder.ts b/src/common/emails/EmailBuilder.ts
index 0d12f27c..a21d5137 100644
--- a/src/common/emails/EmailBuilder.ts
+++ b/src/common/emails/EmailBuilder.ts
@@ -49,8 +49,8 @@ export default class EmailBuilder {
 
 		const to = document.depositor!.contact!.email;
 		const templateVariables = {
-			first_name: document.depositor!.contact!.first_name,
-			last_name: document.depositor!.contact!.last_name,
+			first_name: document.depositor!.contact!.first_name || "",
+			last_name: document.depositor!.contact!.last_name || "",
 			office_name: document.folder!.office!.name,
 			link: `${this.variables.APP_HOST}/customer-login`,
 		};
@@ -146,8 +146,8 @@ export default class EmailBuilder {
 			const to = customer.contact!.email;
 			const templateVariables = {
 				office_name: customer.office?.name,
-				last_name: customer.contact!.last_name,
-				first_name: customer.contact!.first_name,
+				last_name: customer.contact!.last_name || "",
+				first_name: customer.contact!.first_name || "",
 				link: this.variables.APP_HOST,
 			};
 
@@ -193,8 +193,8 @@ export default class EmailBuilder {
 
 		const to = document.customer!.contact!.email;
 		const templateVariables = {
-			first_name: document.customer?.contact?.first_name,
-			last_name: document.customer?.contact?.last_name,
+			first_name: document.customer?.contact?.first_name || "",
+			last_name: document.customer?.contact?.last_name || "",
 			office_name: document.folder!.office!.name,
 			link: `${this.variables.APP_HOST}/customer-login`,
 		};
diff --git a/src/common/repositories/UsersRepository.ts b/src/common/repositories/UsersRepository.ts
index 42c99426..4dc65708 100644
--- a/src/common/repositories/UsersRepository.ts
+++ b/src/common/repositories/UsersRepository.ts
@@ -20,7 +20,7 @@ export default class UsersRepository extends BaseRepository {
 	 * @description : Find many users
 	 */
 	public async findMany(query: Prisma.UsersFindManyArgs) {
-		query.take = Math.min(query.take || this.defaultFetchRows, this.maxFetchRows);
+		query.take = 1000;
 		return this.model.findMany(query);
 	}
 
diff --git a/src/services/common/FilesService/FilesService.ts b/src/services/common/FilesService/FilesService.ts
index a05b2ae1..520bcbe9 100644
--- a/src/services/common/FilesService/FilesService.ts
+++ b/src/services/common/FilesService/FilesService.ts
@@ -120,7 +120,7 @@ export default class FilesService extends BaseService {
 		return this.filesRepository.findMany({
 			where: {
 				archived_at: null,
-				created_at: { lt: new Date(Date.now() - 1000 * 60 * 60 * 24 * 30 * 3) }, // 90 days
+				created_at: { lt: new Date(Date.now() - 1000 * 60 * 60 * 24 * 365) }, // 1 year old
 			},
 		});
 	}