diff --git a/debian/postinst b/debian/postinst
index 7a0371dc2..f43ec2896 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -6,10 +6,18 @@ do_configure() {
   rm -rf /var/cache/moulinette/*
 
   if [ ! -f /etc/yunohost/installed ]; then
-      bash /usr/share/yunohost/hooks/conf_regen/01-yunohost init
-      bash /usr/share/yunohost/hooks/conf_regen/02-ssl init
-      bash /usr/share/yunohost/hooks/conf_regen/06-slapd init
-      bash /usr/share/yunohost/hooks/conf_regen/15-nginx init
+
+      # If apps/ is not empty, we're probably already installed in the past and
+      # something funky happened ...
+      if [ -d /etc/yunohost/apps/ ] && ls /etc/yunohost/apps/* >/dev/null 2>&1
+      then
+          echo "Sounds like /etc/yunohost/installed mysteriously disappeared ... You should probably contact the Yunohost support ..."
+      else
+          bash /usr/share/yunohost/hooks/conf_regen/01-yunohost init
+          bash /usr/share/yunohost/hooks/conf_regen/02-ssl init
+          bash /usr/share/yunohost/hooks/conf_regen/06-slapd init
+          bash /usr/share/yunohost/hooks/conf_regen/15-nginx init
+      fi
   else
       echo "Regenerating configuration, this might take a while..."
       yunohost tools regen-conf --output-as none
diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py
index bdef71cee..d39e3c2d4 100644
--- a/src/yunohost/tools.py
+++ b/src/yunohost/tools.py
@@ -249,6 +249,9 @@ def tools_postinstall(operation_logger, domain, password, ignore_dyndns=False,
     if os.path.isfile('/etc/yunohost/installed'):
         raise YunohostError('yunohost_already_installed')
 
+    if os.path.isdir("/etc/yunohost/apps") and os.listdir("/etc/yunohost/apps") != []:
+        raise YunohostError("It looks like you're trying to re-postinstall a system that was already working previously ... If you recently had some bug or issues with your installation, please first discuss with the team on how to fix the situation instead of savagely re-running the postinstall ...", raw_msg=True)
+
     # Check password
     if not force_password:
         assert_password_is_strong_enough("admin", password)