diff --git a/CHANGELOG.md b/CHANGELOG.md
index c51559c..c48c4ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Refactored WordOps download function with python3-requests
 - MySQL backup path changed to `/var/lib/wo-backup/mysql`
 - Do not check anymore if stack are installed with apt in `wo service` but only if there is a systemd service
+- Refactored `--letsencrypt=renew`. Require the flag `--force` if certificate expiration is more than 45 days
 
 #### Fixed
 
diff --git a/wo/cli/plugins/site.py b/wo/cli/plugins/site.py
index 7a2be55..41ee7f3 100644
--- a/wo/cli/plugins/site.py
+++ b/wo/cli/plugins/site.py
@@ -1091,11 +1091,12 @@ class WOSiteUpdateController(CementBaseController):
 
             if WOAcme.cert_check(self, wo_domain):
                 if not pargs.force:
-                    if (SSL.getexpirationdays(self, wo_domain) > 45):
+                    if (SSL.getexpirationdays(self, wo_domain) > 30):
                         Log.error(
-                            self,
-                            'Your certificate expire in more than 45 days.\n'
-                            'Add \'--force\' to force to renew')
+                            self, "Your cert will expire in more "
+                            "than 30 days ( " +
+                                  str(SSL.getexpirationdays(self, wo_domain)) +
+                                  " days).\nAdd \'--force\' to force to renew")
                 Log.wait(self, "Renewing SSL certificate")
                 if WOAcme.renew(self, wo_domain):
                     Log.valide(self, "Renewing SSL certificate")
@@ -1943,7 +1944,7 @@ class WOSiteDeleteController(CementBaseController):
                 dict(help="forcefully delete site and configuration",
                      action='store_true')),
             (['--all'],
-                dict(help="delete all", action='store_true')),
+                dict(help="delete files & db", action='store_true')),
             (['--db'],
                 dict(help="delete db only", action='store_true')),
             (['--files'],
@@ -1954,7 +1955,7 @@ class WOSiteDeleteController(CementBaseController):
     @expose(hide=True)
     def default(self):
         pargs = self.app.pargs
-        if not pargs.site_name:
+        if not pargs.site_name and not pargs.all:
             try:
                 while not pargs.site_name:
                     pargs.site_name = (input('Enter site name : ')
@@ -1980,6 +1981,9 @@ class WOSiteDeleteController(CementBaseController):
                 (not pargs.all)):
             pargs.all = True
 
+        if pargs.force:
+            pargs.no_prompt = True
+
         # Gather information from wo-db for wo_domain
         check_site = getSiteInfo(self, wo_domain)
         wo_site_type = check_site.site_type