diff --git a/AppendCMS.sh b/AppendCMS.sh
index 3c9d026..d8cf196 100644
--- a/AppendCMS.sh
+++ b/AppendCMS.sh
@@ -219,9 +219,18 @@ msg "                Setting up SSL"
     site_ext=ssl
     if [ $domainwww = 1 ]; then
         /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain" -d "www.$domain"
+        certsatus=$?
     elif [ $domainwww = 0 ]; then
         /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain"
+        certsatus=$?
     fi
+    if test $certsatus -eq 0
+    then
+        site_ext="ssl"
+    else
+        site_ext="nossl"
+    fi
+    unset certsatus
     if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/ssl-handler.sh; then
         source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/ssl-handler.sh)
     fi
diff --git a/CMS/Backend/apache-conf.sh b/CMS/Backend/apache-conf.sh
index cc8ed7b..f458397 100644
--- a/CMS/Backend/apache-conf.sh
+++ b/CMS/Backend/apache-conf.sh
@@ -1,4 +1,4 @@
 curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/Backend/apache-siteBackend-unconfigured -o /tmp/apache-siteconf
 sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$hostname'/g' /tmp/apache-siteconf
-sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/apache-siteconf' -e '/#ConfHere/c\' /etc/apache2/sites-available/Backend_"$site_ext".conf
+sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/apache-siteconf' -e '/#ConfHere/c\' /etc/apache2/sites-available/Backend_"$siteBackend_ext".conf
 systemctl reload apache2
\ No newline at end of file
diff --git a/CMS/Backend/nginx-conf.sh b/CMS/Backend/nginx-conf.sh
index 77e8293..b298b3a 100644
--- a/CMS/Backend/nginx-conf.sh
+++ b/CMS/Backend/nginx-conf.sh
@@ -1,4 +1,4 @@
 curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CMS/Backend/nginx-siteBackend-unconfigured -o /tmp/nginx-backendconf
 sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$hostname'/g' /tmp/nginx-backendconf
-sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-backendconf' -e '/#ConfHere/c\' /etc/nginx/sites-available/Backend_"$site_ext"
+sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-backendconf' -e '/#ConfHere/c\' /etc/nginx/sites-available/Backend_"$siteBackend_ext"
 systemctl reload nginx
diff --git a/CoreModules/apache/ssl-handler.sh b/CoreModules/apache/ssl-handler.sh
index 7a84086..523d267 100644
--- a/CoreModules/apache/ssl-handler.sh
+++ b/CoreModules/apache/ssl-handler.sh
@@ -1,9 +1,9 @@
 rm /etc/apache2/sites-enabled/010-"$sitename".conf
-ln -s /etc/apache2/sites-available/"$sitename"_ssl.conf /etc/apache2/sites-enabled/010-"$sitename".conf
+ln -s /etc/apache2/sites-available/"$sitename"_"$site_ext".conf /etc/apache2/sites-enabled/010-"$sitename".conf
 
 if [ -n "$sslfr" ]; then
 rm /etc/apache2/sites-enabled/010-Backend.conf
-ln -s /etc/apache2/sites-available/Backend_ssl.conf /etc/apache2/sites-enabled/010-Backend.conf
+ln -s /etc/apache2/sites-available/Backend_"$siteBackend_ext".conf /etc/apache2/sites-enabled/010-Backend.conf
 fi
 
 systemctl reload apache2
diff --git a/CoreModules/nginx/ssl-handler.sh b/CoreModules/nginx/ssl-handler.sh
index a625763..fb08ea5 100644
--- a/CoreModules/nginx/ssl-handler.sh
+++ b/CoreModules/nginx/ssl-handler.sh
@@ -1,9 +1,9 @@
 rm /etc/nginx/sites-enabled/"$sitename"
-ln -s /etc/nginx/sites-available/"$sitename"_ssl /etc/nginx/sites-enabled/"$sitename"
+ln -s /etc/nginx/sites-available/"$sitename"_"$site_ext" /etc/nginx/sites-enabled/"$sitename"
 
 if [ -n "$sslfr" ]; then
-rm /etc/nginx/sites-enabled/Backend
-ln -s /etc/nginx/sites-available/Backend_ssl /etc/nginx/sites-enabled/Backend
+    rm /etc/nginx/sites-enabled/Backend
+    ln -s /etc/nginx/sites-available/Backend_"$siteBackend_ext" /etc/nginx/sites-enabled/Backend
 fi
 
 systemctl reload nginx
\ No newline at end of file
diff --git a/CoreModules/nginx_nonphp/ssl-handler.sh b/CoreModules/nginx_nonphp/ssl-handler.sh
index df09d56..5e71eaa 100644
--- a/CoreModules/nginx_nonphp/ssl-handler.sh
+++ b/CoreModules/nginx_nonphp/ssl-handler.sh
@@ -1,4 +1,4 @@
 rm /etc/nginx/sites-enabled/"$sitename"
-ln -s /etc/nginx/sites-available/"$sitename"_ssl /etc/nginx/sites-enabled/"$sitename"
+ln -s /etc/nginx/sites-available/"$sitename"_"$site_ext" /etc/nginx/sites-enabled/"$sitename"
 
 systemctl reload nginx
\ No newline at end of file
diff --git a/Scripts/EnableSSL.sh b/Scripts/EnableSSL.sh
index e8d0b9a..ee070e4 100644
--- a/Scripts/EnableSSL.sh
+++ b/Scripts/EnableSSL.sh
@@ -4,7 +4,6 @@ source /etc/ICTM/mainvar.list
 sitename=CONFname
 domain=DOMAINname
 domainwww=DomainWWW
-email=Email
 webserv=WebServer
 webservice=WebServer
 
@@ -27,13 +26,23 @@ systemctl reload $webservice
 
 #Enabling SSL
 if [ $domainwww = 1 ]; then
-    /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$webservice" --ocsp --keylength 'ec-384' -d "$domain" -d "www.$domain"
+    /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$webserv" --ocsp --keylength 'ec-384' -d "$domain" -d "www.$domain"
+    certsatus=$?
 elif [ $domainwww = 0 ]; then
-    /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$webservice" --ocsp --keylength 'ec-384' -d "$domain"
-fi  
+    /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$webserv" --ocsp --keylength 'ec-384' -d "$domain"
+    certsatus=$?
+fi
+  
+if test $certsatus -eq 0
+then
+	site_ext="ssl"
+else
+	site_ext="nossl"
+fi
+unset certsatus
 
 #Restoring config
-sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e "/#ConfHere1/ r /tmp/"$sitename"-config" -e '/#ConfHere/c\' /etc/"$webservice"/sites-available/"$sitename"_ssl"$ext"
+sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e "/#ConfHere1/ r /tmp/"$sitename"-config" -e '/#ConfHere/c\' /etc/"$webservice"/sites-available/"$sitename"_"$site_ext""$ext"
 source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/ssl-handler.sh)
 
 #Remove script
diff --git a/installer.sh b/installer.sh
index 68b97b9..8f91dff 100644
--- a/installer.sh
+++ b/installer.sh
@@ -629,18 +629,35 @@ if [ $sslenable = 1 ]; then
     else
         certwebserv=$webserv
     fi
-    site_ext=ssl
     if [ $domainwww = 1 ]; then
         /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain" -d "www.$domain"
+        certsatus=$?
     elif [ $domainwww = 0 ]; then
         /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain"
+        certsatus=$?
     fi
+    if test $certsatus -eq 0
+    then
+        site_ext="ssl"
+    else
+        site_ext="nossl"
+    fi
+    unset certsatus
     /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$hostname"
+    certsatusBackend=$?
+
+    if test $certsatusBackend -eq 0
+    then
+        siteBackend_ext="ssl"
+    else
+        siteBackend_ext="nossl"
+    fi
     if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/ssl-handler.sh; then
         sslfr=1 source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/ssl-handler.sh)
     fi
 elif [ $sslenable = 0 ]; then
     site_ext=nossl
+    siteBackend_ext="nossl"
 fi
 
 curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/EnableSSL.sh -o ~/activateSSL-$domain.sh