diff --git a/install/install.php b/install/install.php
index 4dce11cf43d23e6761b78f5d01d603d7bcd1474c..4a04ec3ad230660fa0c4b493bbd3c21c1c697cf2 100644
--- a/install/install.php
+++ b/install/install.php
@@ -247,18 +247,10 @@ if($install_mode == 'standard') {
 	$inst->configure_apps_vhost();
     
 	//* Configure Firewall
-	//** Configure Firewall	
-	if($conf['ufw']['installed'] == true) {
-		//* Configure UFW Firewall
-		$conf['services']['firewall'] = true;
-		swriteln('Configuring UFW Firewall');
-		$inst->configure_ufw_firewall();
-	} else {
-		//* Configure Bastille Firewall
-		$conf['services']['firewall'] = true;
-		swriteln('Configuring Bastille Firewall');
-		$inst->configure_firewall();
-	}
+	//* Configure Bastille Firewall
+	$conf['services']['firewall'] = true;
+	swriteln('Configuring Bastille Firewall');
+	$inst->configure_firewall();
 
     //* Configure Fail2ban
     if($conf['fail2ban']['installed'] == true) {
diff --git a/install/tpl/nginx_ispconfig.vhost.master b/install/tpl/nginx_ispconfig.vhost.master
index c7274fb45be372c6b4f9e482e5d457313c87aca7..2c9173b1513737af99af4f7051821e5f88a99f35 100644
--- a/install/tpl/nginx_ispconfig.vhost.master
+++ b/install/tpl/nginx_ispconfig.vhost.master
@@ -29,7 +29,7 @@ server {
                deny  all;
         }
 		
-        location /phpmyadmin/ {
+        location /phpmyadmin {
                root /usr/share/;
                index index.php index.html index.htm;
                location ~ ^/phpmyadmin/(.+\.php)$ {