diff --git a/cyberpanel.sh b/cyberpanel.sh
index 064d651d1..442bb9384 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -793,7 +793,7 @@ case "$num" in
 	;;
 esac
 
-<<COMMENT
+
 echo -e "\nInstall minimal service for CyberPanel? This will skip PowerDNS, Postfix and Pure-FTPd."
 printf "%s" "Minimal installation [y/N]: "
 read TMP_YN
@@ -825,31 +825,35 @@ else
 		PUREFTPD_VARIABLE="ON"
 		fi
 fi
-COMMENT
+
 #above comment for future use
 
 #if [[ $DEV_ARG == "ON" ]] ; then
-echo -e "Press \e[31mEnter\e[39m to continue with stable version of CyberPanel, or"
-echo -e "\nPlease enter \e[31mbeta\e[39m and then press \e[31mEnter\e[39m to install CyberPanel with Python 3."
-echo -e "\nCentOS 8 will autoamtically proceed with Python 3 branch."
-printf "%s" ""
-read TMP_YN
+#echo -e "Press \e[31mEnter\e[39m to continue with stable version of CyberPanel, or"
+#echo -e "\nPlease enter \e[31mbeta\e[39m and then press \e[31mEnter\e[39m to install CyberPanel with Python 3."
+#echo -e "\nCentOS 8 will autoamtically proceed with Python 3 branch."
+#printf "%s" ""
+#read TMP_YN
 
-if [[ $TMP_YN == "beta" ]] ; then
-  DEV="ON"
-#	echo -e "\nPlease specify branch name"
-#	printf "%s" ""
-#	read TMP_YN
-	BRANCH_NAME="p3"
-	echo -e "Branch name set to $BRANCH_NAME"
-else
-	DEV="OFF"
+DEV="ON"
+BRANCH_NAME="p3"
+echo -e "Branch name set to $BRANCH_NAME"
 
-	if [[ $CENTOS_8 == "True" ]] ; then
-	DEV="ON"
-	BRANCH_NAME="p3"
-		fi
-fi
+#if [[ $TMP_YN == "beta" ]] ; then
+#  DEV="ON"
+##	echo -e "\nPlease specify branch name"
+##	printf "%s" ""
+##	read TMP_YN
+#	BRANCH_NAME="p3"
+#	echo -e "Branch name set to $BRANCH_NAME"
+#else
+#	DEV="OFF"
+#
+#	if [[ $CENTOS_8 == "True" ]] ; then
+#	DEV="ON"
+#	BRANCH_NAME="p3"
+#		fi
+#fi
 
 
 
@@ -954,12 +958,12 @@ echo -e "Installation will start in 10 seconds, if you wish to stop please press
 sleep 10
 debug="1"
 if [[ $debug == "0" ]] ; then
-	echo "/usr/local/CyberPanel/bin/python install.py $SERVER_IP $SERIAL_NO $LICENSE_KEY"
+	echo "/usr/local/CyberPanel/bin/python install.py $SERVER_IP $SERIAL_NO $LICENSE_KEY --postfix $POSTFIX_VARIABLE --powerdns $POWERDNS_VARIABLE --ftp $PUREFTPD_VARIABLE"
 	exit
 fi
 
 if [[ $debug == "1" ]] ; then
-	/usr/local/CyberPanel/bin/python install.py $SERVER_IP $SERIAL_NO $LICENSE_KEY
+	/usr/local/CyberPanel/bin/python install.py $SERVER_IP $SERIAL_NO $LICENSE_KEY --postfix $POSTFIX_VARIABLE --powerdns $POWERDNS_VARIABLE --ftp $PUREFTPD_VARIABLE
 
 	if grep "CyberPanel installation successfully completed" /var/log/installLogs.txt > /dev/null; then
 		echo -e "\nCyberPanel installation sucessfully completed..."
diff --git a/install/install.py b/install/install.py
index 090b003c6..ef4211a7f 100755
--- a/install/install.py
+++ b/install/install.py
@@ -1958,7 +1958,7 @@ milter_default_action = accept
         try:
             servicePath = '/home/cyberpanel/powerdns'
 
-            if state == 'Off':
+            if state == 'off':
 
                 command = 'sudo systemctl stop pdns'
                 subprocess.call(shlex.split(command))
@@ -1984,7 +1984,7 @@ milter_default_action = accept
         try:
             servicePath = '/home/cyberpanel/postfix'
 
-            if state == 'Off':
+            if state == 'off':
 
                 command = 'sudo systemctl stop postfix'
                 subprocess.call(shlex.split(command))
@@ -2010,7 +2010,7 @@ milter_default_action = accept
         try:
             servicePath = '/home/cyberpanel/pureftpd'
 
-            if state == 'Off':
+            if state == 'off':
 
                 command = 'sudo systemctl stop ' + preFlightsChecks.pureFTPDServiceName(distro)
                 subprocess.call(shlex.split(command))
@@ -2303,22 +2303,23 @@ def main():
     checks.fixCyberPanelPermissions()
 
     if args.postfix != None:
-        checks.enableDisableEmail(args.postfix)
+        checks.enableDisableEmail(args.postfix.lower())
     else:
         preFlightsChecks.stdOut("Postfix will be installed and enabled.")
-        checks.enableDisableEmail('On')
+        checks.enableDisableEmail('on')
 
     if args.powerdns != None:
-        checks.enableDisableDNS(args.powerdns)
+        checks.enableDisableDNS(args.powerdns.lower())
     else:
         preFlightsChecks.stdOut("PowerDNS will be installed and enabled.")
-        checks.enableDisableDNS('On')
+        checks.enableDisableDNS('on')
 
     if args.ftp != None:
-        checks.enableDisableFTP(args.ftp, distro)
+        checks.enableDisableFTP(args.ftp.lower(), distro)
     else:
         preFlightsChecks.stdOut("Pure-FTPD will be installed and enabled.")
-        checks.enableDisableFTP('On', distro)
+        checks.enableDisableFTP('on', distro)
+
     checks.installCLScripts()
     logging.InstallLog.writeToFile("CyberPanel installation successfully completed!")