diff --git a/ehcp/ehcpforceupdate.sh b/ehcp/ehcpforceupdate.sh
index 8dd116c..2d86c38 100755
--- a/ehcp/ehcpforceupdate.sh
+++ b/ehcp/ehcpforceupdate.sh
@@ -934,7 +934,7 @@ function genUbuntuFixes(){
 		fi
 		
 		# Ubuntu 18.04 and Debian 10 Fixes
-		if [[ "$distro" == "ubuntu" && "$yrelease" -eq "18" ]] || [[ "$distro" == "debian" && "$yrelease" -eq "10" ]]; then
+		if [[ "$distro" == "ubuntu" && "$yrelease" -eq "18" && "$mrelease" == "04" ]]; then
 			fixQuotaForEmailsPostfix3x
 		fi
 	fi
diff --git a/ehcp/install_main.sh b/ehcp/install_main.sh
index dd4b498..53b19ef 100755
--- a/ehcp/install_main.sh
+++ b/ehcp/install_main.sh
@@ -559,7 +559,7 @@ function genUbuntuFixes(){
 		fi
 		
 		# Ubuntu 18.04 and Debian 10 Fixes
-		if [[ "$distro" == "ubuntu" && "$yrelease" -eq "18" ]] || [[ "$distro" == "debian" && "$yrelease" -eq "10" ]]; then
+		if [[ "$distro" == "ubuntu" && "$yrelease" -eq "18" && "$mrelease" == "04" ]]; then
 			fixQuotaForEmailsPostfix3x
 		fi
 	fi
diff --git a/ehcp/phpmyadmin.conf b/ehcp/phpmyadmin.conf
index 6637f24..5abc020 100755
--- a/ehcp/phpmyadmin.conf
+++ b/ehcp/phpmyadmin.conf
@@ -25,18 +25,6 @@ Alias /phpmyadmin /usr/share/phpmyadmin
 
 </Directory>
 
-# Authorize for setup
-<Directory /usr/share/phpmyadmin/setup>
-    <IfModule mod_authz_core.c>
-        <IfModule mod_authn_file.c>
-            AuthType Basic
-            AuthName "phpMyAdmin Setup"
-            AuthUserFile /etc/phpmyadmin/htpasswd.setup
-        </IfModule>
-        Require valid-user
-    </IfModule>
-</Directory>
-
 # Disallow web access to directories that don't need it
 <Directory /usr/share/phpmyadmin/libraries>
     Require all denied