diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 337bc4682e..166390bc9d 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -72,7 +72,7 @@ function services_dhcpd_configure() {
 	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}/etc\n");
 	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}/usr/local/sbin\n");
 	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}/var/db\n");
-	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}/var/run\n");	
+	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}/var/run\n");
 	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}/usr\n");
 	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}/lib\n");
 	fwrite($fd, "mkdir -p {$g['dhcpd_chroot_path']}/run\n");
diff --git a/usr/local/www/installer.php b/usr/local/www/installer.php
index 1be0720be1..cd0e80b248 100644
--- a/usr/local/www/installer.php
+++ b/usr/local/www/installer.php
@@ -313,7 +313,7 @@ function begin_install() {
 	}
 	// Handle other type of file systems
 	if($_REQUEST['fstype']) 
-		$fstype = htmlspecialchars(strtoupper($_REQUEST['fstype']));
+		$fstype = htmlspecialchars($_REQUEST['fstype']);
 	else 
 		$fstype = "UFS+S";
 	if(substr($_REQUEST['fstype'], -4, 4) == ".eli") {
@@ -447,6 +447,8 @@ function verify_before_install() {
 	$disksize = format_bytes($disk['size'] * 1048576);
 	$swapsize = htmlspecialchars($_REQUEST['swapsize']);
 	$fstype_echo = htmlspecialchars($_REQUEST['fstype']);
+	if(stristr($fstype_echo, ".eli")) 
+		$fstype_echo_enc = " (Encrypted)";
 	$disk_echo = htmlspecialchars($_REQUEST['disk']);
 	$swapsize_echo = htmlspecialchars($_REQUEST['swapsize']);
 	echo <<<EOF
@@ -479,7 +481,7 @@ function verify_before_install() {
 													<tr><td align="right"><b>Description:</td><td>{$disk['desc']}</td></tr>
 													<tr><td align="right"><b>Size:</td><td>{$disksize}</td></tr>
 													<tr><td align="right"><b>SWAP Size:</td><td>{$swapsize}</td></tr>
-													<tr><td align="right"><b>Filesystem:</td><td>{$fstype_echo}</td></tr>
+													<tr><td align="right"><b>Filesystem:</td><td>{$fstype_echo}{$fstype_echo_enc}</td></tr>
 												</table>
 											</div>
 										</center>