diff --git a/ehcp/ehcpforceupdate.sh b/ehcp/ehcpforceupdate.sh
index 35c3273..3f31875 100755
--- a/ehcp/ehcpforceupdate.sh
+++ b/ehcp/ehcpforceupdate.sh
@@ -1738,9 +1738,10 @@ function installAntiSpam(){
 		
 		# Only keep going if we have the basic packages installed
 		AMAVISINS=$(which amavisd-new)
+		AMAVISINSNEW=$(which amavisd)
 		SPAMASSASSINS=$(which spamassassin)
 				
-		if [ ! -z "$AMAVISINS" ] && [ ! -z "$SPAMASSASSINS" ]; then
+		if [[ ! -z "$AMAVISINS" || ! -z "$AMAVISINSNEW" ]] && [ ! -z "$SPAMASSASSINS" ]; then
 		
 			# Add Users
 			adduser clamav amavis
@@ -3549,6 +3550,15 @@ function installPipPackages(){
 	pip install mysqlclient
 	pip install passlib
 	pip install mysqlclient
+	
+	pip2Instance=$(which "pip2")
+	if [ ! -z "$pip2Instance" ]; then
+		pip2 install requests
+		pip2 install chardet
+		pip2 install mysqlclient
+		pip2 install passlib
+		pip2 install mysqlclient
+	fi
 }
 
 ###############################
diff --git a/ehcp/install_main.sh b/ehcp/install_main.sh
index 2afdf3a..ccbcee7 100755
--- a/ehcp/install_main.sh
+++ b/ehcp/install_main.sh
@@ -3195,6 +3195,15 @@ function installPipPackages(){
 	pip install mysqlclient
 	pip install passlib
 	pip install mysqlclient
+	
+	pip2Instance=$(which "pip2")
+	if [ ! -z "$pip2Instance" ]; then
+		pip2 install requests
+		pip2 install chardet
+		pip2 install mysqlclient
+		pip2 install passlib
+		pip2 install mysqlclient
+	fi
 }
 
 #############################################################