diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts
index 3a06d1d69..3cb307b7f 100644
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
@@ -1630,15 +1630,18 @@ export function persistentVolumes(id, persistentStorage, config) {
 			return `${id}${storage.path.replace(/\//gi, '-')}:${storage.path}`;
 		}) || [];
 
-	const volumes = [config.volume, ...persistentVolume]
-	const composeVolumes = volumes.map((volume) => {
+	let volumes = [ ...persistentVolume]
+	if (config.volume) volumes = [config.volume, ...volumes]
+
+	const composeVolumes = volumes.length > 0 && volumes.map((volume) => {
 		return {
 			[`${volume.split(':')[0]}`]: {
 				name: volume.split(':')[0]
 			}
 		};
-	});
-	const volumeMounts = Object.assign(
+	}) || []
+
+	const volumeMounts = config.volume && Object.assign(
 		{},
 		{
 			[config.volume.split(':')[0]]: {
@@ -1646,6 +1649,6 @@ export function persistentVolumes(id, persistentStorage, config) {
 			}
 		},
 		...composeVolumes
-	);
+	) || {}
 	return { volumes, volumeMounts }
 }
\ No newline at end of file
diff --git a/apps/api/src/lib/serviceFields.ts b/apps/api/src/lib/serviceFields.ts
index 7a6b00a85..89d6a9c70 100644
--- a/apps/api/src/lib/serviceFields.ts
+++ b/apps/api/src/lib/serviceFields.ts
@@ -344,7 +344,7 @@ export const fider = [{
 {
 	name: 'emailNoreply',
 	isEditable: true,
-	isLowerCase: true,
+	isLowerCase: false,
 	isNumber: false,
 	isBoolean: false,
 	isEncrypted: false
@@ -352,7 +352,7 @@ export const fider = [{
 {
 	name: 'emailSmtpHost',
 	isEditable: true,
-	isLowerCase: true,
+	isLowerCase: false,
 	isNumber: false,
 	isBoolean: false,
 	isEncrypted: false
@@ -376,7 +376,7 @@ export const fider = [{
 {
 	name: 'emailSmtpUser',
 	isEditable: true,
-	isLowerCase: true,
+	isLowerCase: false,
 	isNumber: false,
 	isBoolean: false,
 	isEncrypted: false