diff --git a/lib/classes/output/class.htmlform.php b/lib/classes/output/class.htmlform.php
index 6eb85f4f..3b39e00b 100644
--- a/lib/classes/output/class.htmlform.php
+++ b/lib/classes/output/class.htmlform.php
@@ -169,7 +169,7 @@ class htmlform
 		if(isset($data['rows'])) {
 			$extras .= ' rows="'.$data['rows'].'"';
 		}
-		$value = isset($data['value']) ? $data['value'] : '';
+		$value = isset($data['value']) ? trim($data['value']) : '';
 
 		eval("\$return = \"" . getTemplate("misc/form/input_textarea", "1") . "\";");
 		return $return;
diff --git a/templates/Classic/admin/configfiles/configfiles_commands.tpl b/templates/Classic/admin/configfiles/configfiles_commands.tpl
index cae61fa5..3ef27e70 100644
--- a/templates/Classic/admin/configfiles/configfiles_commands.tpl
+++ b/templates/Classic/admin/configfiles/configfiles_commands.tpl
@@ -1,3 +1,3 @@
 <tr>
-	<td class="field_display_border_left">{$lng['admin']['configfiles']['commands']}<br /><br /><textarea class="textarea_border" rows="6" cols="70" readonly="readonly">$commands</textarea></td>
-</tr>
\ No newline at end of file
+	<td class="field_display_border_left">{$lng['admin']['configfiles']['commands']}<br /><br /><textarea class="textarea_border" rows="6" cols="70" readonly="readonly">{$commands}</textarea></td>
+</tr>
diff --git a/templates/Classic/admin/configfiles/configfiles_file.tpl b/templates/Classic/admin/configfiles/configfiles_file.tpl
index cbd278e8..cd5260c8 100644
--- a/templates/Classic/admin/configfiles/configfiles_file.tpl
+++ b/templates/Classic/admin/configfiles/configfiles_file.tpl
@@ -1 +1,4 @@
-<p><b>$realname:</b><br /><textarea class="textarea_border" rows="<if $numbrows <= 8 >{$numbrows}</if><if 8 < $numbrows >8</if>" cols="70" readonly="readonly">$file_content</textarea></p>
+<p>
+	<b>{$realname}:</b><br />
+	<textarea rows="<if $numbrows <= 8 >{$numbrows}</if><if 8 < $numbrows >8</if>" cols="70" readonly="readonly">{$file_content}</textarea>
+</p>
diff --git a/templates/Froxlor/admin/configfiles/configfiles_commands.tpl b/templates/Froxlor/admin/configfiles/configfiles_commands.tpl
index b87371ce..9b87ae62 100644
--- a/templates/Froxlor/admin/configfiles/configfiles_commands.tpl
+++ b/templates/Froxlor/admin/configfiles/configfiles_commands.tpl
@@ -1,4 +1,4 @@
 <tr>
 	<td>{$lng['admin']['configfiles']['commands']}<br /><br />
-	<textarea rows="6" cols="70" readonly="readonly">$commands</textarea></td>
+	<textarea rows="6" cols="70" readonly="readonly">{$commands}</textarea></td>
 </tr>
diff --git a/templates/Froxlor/admin/configfiles/configfiles_file.tpl b/templates/Froxlor/admin/configfiles/configfiles_file.tpl
index 852dd76c..e15760f9 100644
--- a/templates/Froxlor/admin/configfiles/configfiles_file.tpl
+++ b/templates/Froxlor/admin/configfiles/configfiles_file.tpl
@@ -1,7 +1,5 @@
 <p>
-	<label><b>$realname:</b></label><br />
-	<textarea rows="<if $numbrows <= 8 >{$numbrows}</if><if 8 < $numbrows >8</if>" cols="70" readonly="readonly">
-		$file_content
-	</textarea>
+	<label><b>{$realname}:</b></label><br />
+	<textarea rows="<if $numbrows <= 8 >{$numbrows}</if><if 8 < $numbrows >8</if>" cols="70" readonly="readonly">{$file_content}</textarea>
 </p>