diff --git a/packages/server/src/services/user.ts b/packages/server/src/services/user.ts
index cd7379429..72298a82b 100644
--- a/packages/server/src/services/user.ts
+++ b/packages/server/src/services/user.ts
@@ -61,10 +61,13 @@ export const canPerformCreationService = async (
 	projectId: string,
 	organizationId: string,
 ) => {
-	const { accessedProjects, canCreateServices } = await findMemberById(
-		userId,
-		organizationId,
-	);
+	const member = await findMemberById(userId, organizationId);
+
+	if (member.role === "owner" || member.role === "admin") {
+		return true;
+	}
+
+	const { accessedProjects, canCreateServices } = member;
 	const haveAccessToProject = accessedProjects.includes(projectId);
 
 	if (canCreateServices && haveAccessToProject) {
@@ -79,7 +82,13 @@ export const canPerformAccessService = async (
 	serviceId: string,
 	organizationId: string,
 ) => {
-	const { accessedServices } = await findMemberById(userId, organizationId);
+	const member = await findMemberById(userId, organizationId);
+
+	if (member.role === "owner" || member.role === "admin") {
+		return true;
+	}
+
+	const { accessedServices } = member;
 	const haveAccessToService = accessedServices.includes(serviceId);
 
 	if (haveAccessToService) {
@@ -94,10 +103,13 @@ export const canPeformDeleteService = async (
 	serviceId: string,
 	organizationId: string,
 ) => {
-	const { accessedServices, canDeleteServices } = await findMemberById(
-		userId,
-		organizationId,
-	);
+	const member = await findMemberById(userId, organizationId);
+
+	if (member.role === "owner" || member.role === "admin") {
+		return true;
+	}
+
+	const { accessedServices, canDeleteServices } = member;
 	const haveAccessToService = accessedServices.includes(serviceId);
 
 	if (canDeleteServices && haveAccessToService) {
@@ -111,7 +123,13 @@ export const canPerformCreationProject = async (
 	userId: string,
 	organizationId: string,
 ) => {
-	const { canCreateProjects } = await findMemberById(userId, organizationId);
+	const member = await findMemberById(userId, organizationId);
+
+	if (member.role === "owner" || member.role === "admin") {
+		return true;
+	}
+
+	const { canCreateProjects } = member;
 
 	if (canCreateProjects) {
 		return true;
@@ -124,7 +142,13 @@ export const canPerformDeleteProject = async (
 	userId: string,
 	organizationId: string,
 ) => {
-	const { canDeleteProjects } = await findMemberById(userId, organizationId);
+	const member = await findMemberById(userId, organizationId);
+
+	if (member.role === "owner" || member.role === "admin") {
+		return true;
+	}
+
+	const { canDeleteProjects } = member;
 
 	if (canDeleteProjects) {
 		return true;
@@ -138,7 +162,13 @@ export const canPerformAccessProject = async (
 	projectId: string,
 	organizationId: string,
 ) => {
-	const { accessedProjects } = await findMemberById(userId, organizationId);
+	const member = await findMemberById(userId, organizationId);
+
+	if (member.role === "owner" || member.role === "admin") {
+		return true;
+	}
+
+	const { accessedProjects } = member;
 
 	const haveAccessToProject = accessedProjects.includes(projectId);
 
@@ -153,7 +183,13 @@ export const canPerformAccessEnvironment = async (
 	environmentId: string,
 	organizationId: string,
 ) => {
-	const { accessedEnvironments } = await findMemberById(userId, organizationId);
+	const member = await findMemberById(userId, organizationId);
+
+	if (member.role === "owner" || member.role === "admin") {
+		return true;
+	}
+
+	const { accessedEnvironments } = member;
 	const haveAccessToEnvironment = accessedEnvironments.includes(environmentId);
 
 	if (haveAccessToEnvironment) {
@@ -168,10 +204,13 @@ export const canPerformDeleteEnvironment = async (
 	projectId: string,
 	organizationId: string,
 ) => {
-	const { accessedProjects, canDeleteEnvironments } = await findMemberById(
-		userId,
-		organizationId,
-	);
+	const member = await findMemberById(userId, organizationId);
+
+	if (member.role === "owner" || member.role === "admin") {
+		return true;
+	}
+
+	const { accessedProjects, canDeleteEnvironments } = member;
 	const haveAccessToProject = accessedProjects.includes(projectId);
 
 	if (canDeleteEnvironments && haveAccessToProject) {
@@ -185,10 +224,13 @@ export const canAccessToTraefikFiles = async (
 	userId: string,
 	organizationId: string,
 ) => {
-	const { canAccessToTraefikFiles } = await findMemberById(
-		userId,
-		organizationId,
-	);
+	const member = await findMemberById(userId, organizationId);
+
+	if (member.role === "owner" || member.role === "admin") {
+		return true;
+	}
+
+	const { canAccessToTraefikFiles } = member;
 	return canAccessToTraefikFiles;
 };
 
@@ -265,13 +307,6 @@ export const checkEnvironmentDeletionPermission = async (
 ) => {
 	const member = await findMemberById(userId, organizationId);
 
-	if (!member) {
-		throw new TRPCError({
-			code: "UNAUTHORIZED",
-			message: "User not found in organization",
-		});
-	}
-
 	if (member.role === "owner" || member.role === "admin") {
 		return true;
 	}
@@ -331,22 +366,12 @@ export const checkEnvironmentCreationPermission = async (
 	projectId: string,
 	organizationId: string,
 ) => {
-	// Get user's member record
 	const member = await findMemberById(userId, organizationId);
 
-	if (!member) {
-		throw new TRPCError({
-			code: "UNAUTHORIZED",
-			message: "User not found in organization",
-		});
-	}
-
-	// Owners and admins can always create environments
 	if (member.role === "owner" || member.role === "admin") {
 		return true;
 	}
 
-	// Check if user has canCreateEnvironments permission
 	if (!member.canCreateEnvironments) {
 		throw new TRPCError({
 			code: "UNAUTHORIZED",
@@ -354,7 +379,6 @@ export const checkEnvironmentCreationPermission = async (
 		});
 	}
 
-	// Check if user has access to the project
 	const hasProjectAccess = member.accessedProjects.includes(projectId);
 	if (!hasProjectAccess) {
 		throw new TRPCError({
@@ -390,16 +414,20 @@ export const findMemberById = async (
 };
 
 export const updateUser = async (userId: string, userData: Partial<User>) => {
-	// Validate email if it's being updated
 	if (userData.email !== undefined) {
 		if (!userData.email || userData.email.trim() === "") {
-			throw new Error("Email is required and cannot be empty");
+			throw new TRPCError({
+				code: "BAD_REQUEST",
+				message: "Email is required and cannot be empty",
+			});
 		}
 
-		// Basic email format validation
 		const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 		if (!emailRegex.test(userData.email)) {
-			throw new Error("Please enter a valid email address");
+			throw new TRPCError({
+				code: "BAD_REQUEST",
+				message: "Please enter a valid email address",
+			});
 		}
 	}