diff --git a/distros/debian8/po/fr.po b/distros/debian8/po/fr.po
index 28659a683..8b512df1b 100644
--- a/distros/debian8/po/fr.po
+++ b/distros/debian8/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zoneminder\n"
 "Report-Msgid-Bugs-To: zoneminder@packages.debian.org\n"
-"POT-Creation-Date: 2014-12-10 11:04+0100\n"
+"POT-Creation-Date: 2014-12-12 12:28+0100\n"
 "PO-Revision-Date: 2014-12-07 00:40+0100\n"
 "Last-Translator: Emmanuel Papin <manupap01@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -16,105 +16,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../zoneminder.templates:1001
-msgid "Configure ZoneMinder automatically?"
-msgstr "Configurer ZoneMinder automatiquement ?"
-
-#. Type: boolean
-#. Description
-#: ../zoneminder.templates:1001
-msgid ""
-"This configuration assistant allows you to perform automatically the basic "
-"configuration of ZoneMinder."
-msgstr ""
-"Cet assistant de configuration vous permet de réaliser automatiquement le "
-"paramétrage de base de ZoneMinder."
-
-#. Type: boolean
-#. Description
-#: ../zoneminder.templates:1001
-msgid "If you choose to leave this assistant, you can resume it by invoking:"
-msgstr "Si vous choisissez de quitter cet assistant, vous pouvez le reprendre "
-"en invoquant :"
-
-#. Type: boolean
-#. Description
-#. Type: error
-#. Description
-#. Type: error
-#. Description
-#: ../zoneminder.templates:1001 ../zoneminder.templates:5001
-#: ../zoneminder.templates:6001
-msgid "$ sudo dpkg-reconfigure zoneminder"
-msgstr "$ sudo dpkg-reconfigure zoneminder"
-
-#. Type: error
-#. Description
-#: ../zoneminder.templates:2001
-msgid "Configuration file is missing:"
-msgstr "Le fichier de configuration est manquant :"
-
-#. Type: error
-#. Description
-#: ../zoneminder.templates:2001
-msgid "ZoneMinder installation is corrupted."
-msgstr "L'installation de ZoneMinder est corrompue."
-
-#. Type: error
-#. Description
-#: ../zoneminder.templates:2001
-msgid "The main configuration file '/etc/zm/zm.conf' is missing."
-msgstr "Le fichier de configuration principal '/etc/zm/zm.conf' est manquant."
-
-#. Type: error
-#. Description
-#: ../zoneminder.templates:3001
-msgid "Bad database type:"
-msgstr "Mauvais type de base de données :"
-
-#. Type: error
-#. Description
-#: ../zoneminder.templates:3001
-msgid ""
-"The database type specified in the configuration file '/etc/zm/zm.conf' is "
-"not set to 'mysql'."
-msgstr ""
-"Le type de base de données spécifié dans le fichier de configuration '/etc/"
-"zm/zm/conf' n'est pas 'mysql'."
-
-#. Type: error
-#. Description
-#: ../zoneminder.templates:3001
-msgid ""
-"This program will abort so you can fix the configuration file and then "
-"restart the installation of ZoneMinder."
-msgstr ""
-"Ce programme va s'arrêter afin que vous puissiez corriger le fichier de "
-"configuration puis veuillez redémarrer l'installation de ZoneMinder."
-
 #. Type: select
 #. Choices
-#: ../zoneminder.templates:4001
+#: ../zoneminder.templates:1001
 msgid "local"
 msgstr "local"
 
 #. Type: select
 #. Choices
-#: ../zoneminder.templates:4001
+#: ../zoneminder.templates:1001
 msgid "remote"
 msgstr "distant"
 
 #. Type: select
 #. Description
-#: ../zoneminder.templates:4002
+#: ../zoneminder.templates:1002
 msgid "Database location:"
 msgstr "Emplacement de la base de donnée :"
 
 #. Type: select
 #. Description
-#: ../zoneminder.templates:4002
+#: ../zoneminder.templates:1002
 msgid ""
 "A database server is required to run ZoneMinder. The database can be "
 "installed either locally or remotely on a machine of your network."
@@ -124,7 +46,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../zoneminder.templates:4002
+#: ../zoneminder.templates:1002
 msgid ""
 "If you choose a remote location, you will have to select the 'tcp/ip' "
 "connection method and enter the hostname or ip address of the remote machine "
@@ -136,13 +58,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:5001
+#: ../zoneminder.templates:2001
 msgid "No local database server is available:"
 msgstr "Aucun serveur local de base de données n'est disponible :"
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:5001
+#: ../zoneminder.templates:2001
 msgid ""
 "Currently ZoneMinder supports mysql or mariadb database server but none of "
 "them appears to be installed on this machine."
@@ -152,9 +74,9 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:5001
+#: ../zoneminder.templates:2001
 msgid ""
-"In order to complete the installation of ZoneMinder, after ending of this "
+"In order to complete ZoneMinder's installation, after ending of this "
 "assistant, please install a compatible database server and then restart the "
 "assistant by invoking:"
 msgstr ""
@@ -164,77 +86,85 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:6001
+#. Type: error
+#. Description
+#: ../zoneminder.templates:2001 ../zoneminder.templates:3001
+msgid "$ sudo dpkg-reconfigure zoneminder"
+msgstr "$ sudo dpkg-reconfigure zoneminder"
+
+#. Type: error
+#. Description
+#: ../zoneminder.templates:3001
 msgid "Remote database servers are not allowed:"
 msgstr "Les serveurs de base de données distants ne sont pas autorisés :"
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:6001
+#: ../zoneminder.templates:3001
 msgid ""
 "The current configuration of dbconfig-common does not allow installation of "
-"databases on remote servers from this assistant."
+"a database on remote servers."
 msgstr ""
 "La configuration actuelle de dbconfig-common ne permet pas l'installation de "
-"bases de données sur des serveurs distants à partir de cet assistant."
+"bases de données sur des serveurs distants."
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:6001
+#: ../zoneminder.templates:3001
 msgid ""
-"In order to reconfigure dbconfig-common, after ending of this assistant, "
-"please invoke:"
+"In order to reconfigure dbconfig-common, please invoke the following command "
+"after ending of this assistant:"
 msgstr ""
-"Afin de reconfigurer dbconfig-common, après la fermeture de cet assitant, "
-"veuillez invoquer :"
+"Afin de reconfigurer dbconfig-common, veuillez invoquer la commande suivante "
+"après la fermeture de cet assitant :"
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:6001
+#: ../zoneminder.templates:3001
 msgid "$ sudo dpkg-reconfigure dbconfig-common"
 msgstr "$ sudo dpkg-reconfigure dbconfig-common"
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:6001
+#: ../zoneminder.templates:3001
 msgid ""
-"Then, to complete the installation of ZoneMinder, please restart this "
-"assistant by invoking:"
+"Then, to complete ZoneMinder's installation, please restart this assistant "
+"by invoking:"
 msgstr ""
 "Ensuite, pour compléter l'installation de ZoneMinder, veuillez redémarrer "
 "cet assistant en invoquant :"
 
 #. Type: multiselect
 #. Description
-#: ../zoneminder.templates:7001
+#: ../zoneminder.templates:4001
 msgid "Web server to reconfigure automatically:"
 msgstr "Serveur web à reconfigurer automatiquement :"
 
 #. Type: multiselect
 #. Description
-#: ../zoneminder.templates:7001
+#: ../zoneminder.templates:4001
 msgid ""
-"Please choose the web server that should be automatically configure to run "
-"ZoneMinder."
+"Please choose the web server that should be automatically configured for "
+"ZoneMinder's web portal access."
 msgstr ""
-"Veuillez choisir le serveur web à reconfigurer automatiquement pour exécuter "
-"ZoneMinder."
+"Veuillez choisir le serveur web à reconfigurer automatiquement pour l'accès "
+"au portail web de ZoneMinder."
 
 #. Type: password
 #. Description
-#: ../zoneminder.templates:8001
+#: ../zoneminder.templates:5001
 msgid "New password for the ZoneMinder 'admin' user:"
 msgstr "Nouveau mot de passe pour le compte 'admin' de ZoneMinder :"
 
 #. Type: password
 #. Description
-#: ../zoneminder.templates:8001
+#: ../zoneminder.templates:5001
 msgid "Please enter the password of the default administrative user."
 msgstr "Veuillez entrer le mot de passe du compte administrateur par défaut."
 
 #. Type: password
 #. Description
-#: ../zoneminder.templates:8001
+#: ../zoneminder.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a custom password "
 "for the administrative 'admin' user."
@@ -244,25 +174,25 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../zoneminder.templates:8001
+#: ../zoneminder.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Si le champ est laissé vide, le mot de passe ne sera pas changé."
 
 #. Type: password
 #. Description
-#: ../zoneminder.templates:9001
+#: ../zoneminder.templates:6001
 msgid "Repeat password for the ZoneMinder 'admin' user:"
 msgstr "Répéter le mot de passe pour le compte 'admin' de ZoneMinder :"
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:10001
+#: ../zoneminder.templates:7001
 msgid "Password input error"
 msgstr "Erreur de mot de passe"
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:10001
+#: ../zoneminder.templates:7001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 "Les deux mots de passe saisis ne sont pas les mêmes. Veuillez essayer à "
@@ -270,13 +200,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../zoneminder.templates:11001
+#: ../zoneminder.templates:8001
 msgid "Delete this non empty directory?"
 msgstr "Supprimer ce répertoire non vide ?"
 
 #. Type: boolean
 #. Description
-#: ../zoneminder.templates:11001
+#: ../zoneminder.templates:8001
 msgid ""
 "A purge of the ZoneMinder package is performed but the directory '/var/cache/"
 "zoneminder' is not empty so it will not be deleted."
@@ -286,7 +216,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../zoneminder.templates:11001
+#: ../zoneminder.templates:8001
 msgid ""
 "Please consider that this directory is designed to contain data resulting "
 "from event detection. Therefore, \"proof of evidence\" could be lost!\""
@@ -297,7 +227,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../zoneminder.templates:11001
+#: ../zoneminder.templates:8001
 msgid ""
 "If you are not sure of your decision, please do not delete this directory "
 "but perform a manual checkup."
@@ -307,13 +237,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../zoneminder.templates:12001
+#: ../zoneminder.templates:9001
 msgid "Deletion confirmed?"
 msgstr "Supression confirmée ?"
 
 #. Type: boolean
 #. Description
-#: ../zoneminder.templates:12001
+#: ../zoneminder.templates:9001
 msgid ""
 "You have allowed the deletion of directory '/var/cache/zoneminder' although "
 "it may contain critical data."
diff --git a/distros/debian8/po/templates.pot b/distros/debian8/po/templates.pot
index 4e8f57691..7d10caa4b 100644
--- a/distros/debian8/po/templates.pot
+++ b/distros/debian8/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zoneminder\n"
 "Report-Msgid-Bugs-To: zoneminder@packages.debian.org\n"
-"POT-Creation-Date: 2014-12-10 11:04+0100\n"
+"POT-Creation-Date: 2014-12-12 12:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,98 +17,27 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../zoneminder.templates:1001
-msgid "Configure ZoneMinder automatically?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder.templates:1001
-msgid ""
-"This configuration assistant allows you to perform automatically the basic "
-"configuration of ZoneMinder."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder.templates:1001
-msgid "If you choose to leave this assistant, you can resume it by invoking:"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#. Type: error
-#. Description
-#. Type: error
-#. Description
-#: ../zoneminder.templates:1001 ../zoneminder.templates:5001
-#: ../zoneminder.templates:6001
-msgid "$ sudo dpkg-reconfigure zoneminder"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder.templates:2001
-msgid "Configuration file is missing:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder.templates:2001
-msgid "ZoneMinder installation is corrupted."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder.templates:2001
-msgid "The main configuration file '/etc/zm/zm.conf' is missing."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder.templates:3001
-msgid "Bad database type:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder.templates:3001
-msgid ""
-"The database type specified in the configuration file '/etc/zm/zm.conf' is "
-"not set to 'mysql'."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder.templates:3001
-msgid ""
-"This program will abort so you can fix the configuration file and then "
-"restart the installation of ZoneMinder."
-msgstr ""
-
 #. Type: select
 #. Choices
-#: ../zoneminder.templates:4001
+#: ../zoneminder.templates:1001
 msgid "local"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../zoneminder.templates:4001
+#: ../zoneminder.templates:1001
 msgid "remote"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../zoneminder.templates:4002
+#: ../zoneminder.templates:1002
 msgid "Database location:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../zoneminder.templates:4002
+#: ../zoneminder.templates:1002
 msgid ""
 "A database server is required to run ZoneMinder. The database can be "
 "installed either locally or remotely on a machine of your network."
@@ -116,7 +45,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../zoneminder.templates:4002
+#: ../zoneminder.templates:1002
 msgid ""
 "If you choose a remote location, you will have to select the 'tcp/ip' "
 "connection method and enter the hostname or ip address of the remote machine "
@@ -125,13 +54,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:5001
+#: ../zoneminder.templates:2001
 msgid "No local database server is available:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:5001
+#: ../zoneminder.templates:2001
 msgid ""
 "Currently ZoneMinder supports mysql or mariadb database server but none of "
 "them appears to be installed on this machine."
@@ -139,78 +68,86 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:5001
+#: ../zoneminder.templates:2001
 msgid ""
-"In order to complete the installation of ZoneMinder, after ending of this "
+"In order to complete ZoneMinder's installation, after ending of this "
 "assistant, please install a compatible database server and then restart the "
 "assistant by invoking:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:6001
+#. Type: error
+#. Description
+#: ../zoneminder.templates:2001 ../zoneminder.templates:3001
+msgid "$ sudo dpkg-reconfigure zoneminder"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../zoneminder.templates:3001
 msgid "Remote database servers are not allowed:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:6001
+#: ../zoneminder.templates:3001
 msgid ""
 "The current configuration of dbconfig-common does not allow installation of "
-"databases on remote servers from this assistant."
+"a database on remote servers."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:6001
+#: ../zoneminder.templates:3001
 msgid ""
-"In order to reconfigure dbconfig-common, after ending of this assistant, "
-"please invoke:"
+"In order to reconfigure dbconfig-common, please invoke the following command "
+"after ending of this assistant:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:6001
+#: ../zoneminder.templates:3001
 msgid "$ sudo dpkg-reconfigure dbconfig-common"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:6001
+#: ../zoneminder.templates:3001
 msgid ""
-"Then, to complete the installation of ZoneMinder, please restart this "
-"assistant by invoking:"
+"Then, to complete ZoneMinder's installation, please restart this assistant "
+"by invoking:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../zoneminder.templates:7001
+#: ../zoneminder.templates:4001
 msgid "Web server to reconfigure automatically:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../zoneminder.templates:7001
+#: ../zoneminder.templates:4001
 msgid ""
-"Please choose the web server that should be automatically configure to run "
-"ZoneMinder."
+"Please choose the web server that should be automatically configured for "
+"ZoneMinder's web portal access."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../zoneminder.templates:8001
+#: ../zoneminder.templates:5001
 msgid "New password for the ZoneMinder 'admin' user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../zoneminder.templates:8001
+#: ../zoneminder.templates:5001
 msgid "Please enter the password of the default administrative user."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../zoneminder.templates:8001
+#: ../zoneminder.templates:5001
 msgid ""
 "While not mandatory, it is highly recommended that you set a custom password "
 "for the administrative 'admin' user."
@@ -218,37 +155,37 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../zoneminder.templates:8001
+#: ../zoneminder.templates:5001
 msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../zoneminder.templates:9001
+#: ../zoneminder.templates:6001
 msgid "Repeat password for the ZoneMinder 'admin' user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:10001
+#: ../zoneminder.templates:7001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../zoneminder.templates:10001
+#: ../zoneminder.templates:7001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../zoneminder.templates:11001
+#: ../zoneminder.templates:8001
 msgid "Delete this non empty directory?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../zoneminder.templates:11001
+#: ../zoneminder.templates:8001
 msgid ""
 "A purge of the ZoneMinder package is performed but the directory '/var/cache/"
 "zoneminder' is not empty so it will not be deleted."
@@ -256,7 +193,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../zoneminder.templates:11001
+#: ../zoneminder.templates:8001
 msgid ""
 "Please consider that this directory is designed to contain data resulting "
 "from event detection. Therefore, \"proof of evidence\" could be lost!\""
@@ -264,7 +201,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../zoneminder.templates:11001
+#: ../zoneminder.templates:8001
 msgid ""
 "If you are not sure of your decision, please do not delete this directory "
 "but perform a manual checkup."
@@ -272,13 +209,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../zoneminder.templates:12001
+#: ../zoneminder.templates:9001
 msgid "Deletion confirmed?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../zoneminder.templates:12001
+#: ../zoneminder.templates:9001
 msgid ""
 "You have allowed the deletion of directory '/var/cache/zoneminder' although "
 "it may contain critical data."
diff --git a/distros/debian8/zoneminder.config b/distros/debian8/zoneminder.config
index c9bd2440f..88cd62695 100644
--- a/distros/debian8/zoneminder.config
+++ b/distros/debian8/zoneminder.config
@@ -1,7 +1,7 @@
 #!/bin/sh
 # config maintainer script for zoneminder
 
-set -ex
+set -e
 
 # Source the debconf stuff
 . /usr/share/debconf/confmodule
@@ -9,27 +9,17 @@ set -ex
 # Set the first version in which dbconfig-common was introduced in the package
 dbc_first_version="1.28.0"
 
-CONFIGFILE=/etc/zm/zm.conf
-
 # Source the config file if exists
+CONFIGFILE=/etc/zm/zm.conf
 if [ -e $CONFIGFILE ]; then
-    . $CONFIGFILE || true
-else
-    # Display a message and exit with error if no config file
-    db_input high zoneminder/debconf_confmissingerror || true
-    db_go || true
-    exit 1
-fi
-
-if [ ! "$ZM_DB_TYPE" = "mysql" ]; then
-    # Display a message and exit with error if wrong database type
-    db_input high zoneminder/debconf_dbtypeerror || true
-    db_go || true
-    exit 1
+    . $CONFIGFILE
 fi
 
 if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
 
+    # Default use dbconfig-common
+    dbc_install="true"
+
     # Currently we only support mysql database
     dbc_dbtypes="mysql"
 
@@ -45,68 +35,57 @@ if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
     . /usr/share/dbconfig-common/dpkg/config
 fi
 
-if [ "$1" = "configure" ]; then
-
-    # Ask the user if debconf shall be used to configure the package
-    db_input high zoneminder/debconf_install || true
-    db_go || true
-
-    # Exit if the user does not want to use debconf
-    db_get zoneminder/debconf_install
-    [ "$RET" = "false" ] && exit 0
-
-fi
-
+# Do this when the package is installed, upgraded or reconfigured
+# Most of answers are cached so the questions will not be asked again
 if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
 
-DB_OK=false
+    # Ask the user if the database shall be installed locally or remotely
+    db_input high zoneminder/debconf_dblocation || true
+    db_go || true
+    db_get zoneminder/debconf_dblocation
 
-# Ask the user if the database shall be installed locally or remotely
-db_input high zoneminder/debconf_dblocation || true
-db_go || true
-db_get zoneminder/debconf_dblocation
-if [ "$RET" = "local" ]; then
-    if [ ! -e "/usr/sbin/mysqld" ]; then
-        # Display a message if the user want a local database but no database
-        # server is available
-        db_input high zoneminder/debconf_dblocalmissingerror || true
-        db_go || true
+    if [ "$RET" = "local" ]; then
+        if [ ! -e "/usr/sbin/mysqld" ]; then
+            # Display a message and exit if the user want a local database but
+            # no database server is available
+            db_input high zoneminder/debconf_dblocalmissingerror || true
+            db_go || true
+            exit 0
+        else
+            # Set the database server to localhost
+            dbc_dbserver="localhost"
+        fi
     else
-        DB_OK=true
-        # Set the database server to localhost
-        dbc_dbserver="localhost"
+        # Source the dbconfig main configuration file
+        if [ -f /etc/dbconfig-common/config ]; then
+            . /etc/dbconfig-common/config
+        fi
+        if [ "$dbc_remote_questions_default" = "false" ]; then
+            # Display a message and exit if the dbconfig configuration does not
+            # allow installation of remote databases
+            # Note: To overcome this issue, we could think to override the
+            # default setting by using dbc_remote_questions_default='true' in
+            # maintainer scripts but unfortunately this does not work due to
+            # current dbconfig design
+            # More information here:
+            # https://bugs.launchpad.net/ubuntu/+source/dbconfig-common/+bug/1065331
+            db_input high zoneminder/debconf_dbconfigerror || true
+            db_go || true
+            exit 0
+        fi
     fi
-else
-    # Source the dbconfig main configuration file
-    if [ -f /etc/dbconfig-common/config ]; then
-        . /etc/dbconfig-common/config
-    fi
-    if [ "$dbc_remote_questions_default" = "false" ]; then
-        # Display a message if the dbconfig configuration does not allow
-        # installation of databases on remote servers from this assistant
-        # Note: It would be nice to override the default configuration by
-        # setting dbc_remote_questions_default to true here but unfortunately
-        # this does not work
-        # https://bugs.launchpad.net/ubuntu/+source/dbconfig-common/+bug/1065331
-        db_input high zoneminder/debconf_dbconfigerror || true
-        db_go || true
-    else
-        DB_OK=true
-    fi
-fi
 
-#if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
-
-    # If db config is ok, ask the user for all other settings about the database
-    [ "$DB_OK" = "true" ] && dbc_go zoneminder $@
+    # Ask the user for all database settings
+    dbc_go zoneminder $@
 
     # Ask the user for the web server(s) to configure
     db_input high zoneminder/webserver || true
     db_go || true
 
     # Ask the user for the password of the database administrator if the user
-    # has not yet answered this question. This may happen if the user skipped
-    # the database creation step when reconfiguring the package.
+    # has not yet answered to this question.
+    # This situation may occur if the user skipped the database creation step
+    # when reconfiguring the package.
     RET=""
     db_get zoneminder/mysql/admin-pass
     if [ -z "$RET" ]; then
@@ -114,32 +93,39 @@ fi
         db_go || true
     fi
 
-    # Ask for the password of 'admin' user
-    while :; do
-        RET=""
-        db_input high zoneminder/admin_password || true
-        db_go || true
-        db_get zoneminder/admin_password
-        # If password isn't empty we ask for password verification
-        if [ -z "$RET" ]; then
-            db_fset zoneminder/admin_password seen false
-            db_fset zoneminder/admin_password_again seen false
-            break
-        fi
-        ROOT_PW="$RET"
-        db_input high zoneminder/admin_password_again || true
-        db_go || true
-        db_get zoneminder/admin_password_again
-        if [ "$RET" = "$ROOT_PW" ]; then
-            ROOT_PW=""
-            break
-        fi
-        db_fset zoneminder/password_mismatch seen false
-        db_input critical zoneminder/password_mismatch || true
+    # Do this only when not upgrading the package (no old version in argument)
+    if [ -z "$2" ]; then
+        # Ask for the password of 'admin' user
+        while :; do
+            RET=""
+            db_input high zoneminder/admin_password || true
+            db_go || true
+            db_get zoneminder/admin_password
+            # If password isn't empty we ask for password verification
+            if [ -z "$RET" ]; then
+                db_fset zoneminder/admin_password seen false
+                db_fset zoneminder/admin_password_again seen false
+                break
+            fi
+            ROOT_PW="$RET"
+            db_input high zoneminder/admin_password_again || true
+            db_go || true
+            db_get zoneminder/admin_password_again
+            if [ "$RET" = "$ROOT_PW" ]; then
+                ROOT_PW=""
+                break
+            fi
+            db_fset zoneminder/password_mismatch seen false
+            db_input critical zoneminder/password_mismatch || true
+            db_set zoneminder/admin_password ""
+            db_set zoneminder/admin_password_again ""
+            db_go || true
+        done
+    else
+        # If we are upgrading the package, set an empty password to disable
+        # password update in ZoneMinder database
         db_set zoneminder/admin_password ""
-        db_set zoneminder/admin_password_again ""
-        db_go || true
-    done
+    fi
 
 fi
 
diff --git a/distros/debian8/zoneminder.postinst b/distros/debian8/zoneminder.postinst
index 9f0d2a93b..bfa3f2e7b 100644
--- a/distros/debian8/zoneminder.postinst
+++ b/distros/debian8/zoneminder.postinst
@@ -1,14 +1,19 @@
 #! /bin/sh
 # postinst maintainer script for zoneminder
 
-set -ex
+set -e
 
 # Source the debconf stuff
 . /usr/share/debconf/confmodule
 
+# Source the config file if exists
 CONFIGFILE=/etc/zm/zm.conf
+if [ -e $CONFIGFILE ]; then
+    . $CONFIGFILE
+fi
 
 apache_install() {
+
     mkdir -p /etc/apache2/conf-available
     ln -sf ../../zm/apache.conf /etc/apache2/conf-available/zoneminder.conf
 
@@ -40,31 +45,19 @@ mysql_update() {
     dbc_mysql_exec_command "UPDATE Config SET Value = '$DB_VERSION' WHERE Name = 'ZM_DYN_DB_VERSION';" || true
 }
 
-# Exit if user didn't want to use debconf
-db_get zoneminder/debconf_install
-if [ "$RET" = "false" ]; then
-  # Reset the answer otherwise we are stuck here if the user choose to not use
-  # debconf at first install (the question is not asked when reconfiguring)
-  db_reset zoneminder/debconf_install
-  exit 0
-fi
-
-# Source the config file if exists
-[ ! -e $CONFIGFILE ] && exit 0
-. $CONFIGFILE
-
 if [ -f /usr/share/dbconfig-common/dpkg/postinst ]; then
 
     # Set the first version in which dbconfig-common was introduced in the package
     dbc_first_version="1.28.0"
 
     # Set the database type
-    dbc_dbtypes="$ZM_DB_TYPE"
+    dbc_dbtypes="mysql"
 
     # Source the dbconfig-common stuff
     . /usr/share/dbconfig-common/dpkg/postinst
 fi
 
+# Do this when the package is installed, upgraded or reconfigured
 if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
 
     # Create the underlying database and populate it
@@ -75,7 +68,9 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
     # Get the password of ZoneMinder user 'admin' from debconf
     db_get zoneminder/admin_password
     ADMIN_PASSWORD=$RET
-    db_reset zoneminder/admin_password || true
+
+    # Remove the password from debconf database
+    test -z $ADMIN_PASSWORD || db_reset zoneminder/admin_password || true
 
     # Get the lastest database version from dbconfig upgrade folder
     DB_VERSION=$(ls -rv /usr/share/dbconfig-common/data/zoneminder/upgrade/$dbc_dbtypes | head -1)
@@ -122,6 +117,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
     # Clean-up backup file
     mv -f ${CONFIGFILE}.postinst.bak $CONFIGFILE
 
+
     # Set some file permissions
     chown $ZM_WEB_USER:$ZM_WEB_GROUP /var/log/zm
     chown $ZM_WEB_USER:$ZM_WEB_GROUP /var/lib/zm
@@ -145,20 +141,16 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
     done
 fi
 
-if [ "$1" = "configure" ]; then
+# Do this every time the package is installed or upgraded
+# Test for database presence to avoid failure of zmupdate.pl
+if [ "$dbc_install" = "true" ] && [ "$1" = "configure" ]; then
 
     # Ensure zoneminder is stopped
     deb-systemd-invoke stop zoneminder.service || exit $?
 
-    # If mysql server exists and is running
-    if [ -e "/usr/sbin/mysqld" ] && deb-systemd-invoke start mysql.service; then
-        # Run the ZoneMinder update tool
-        zmupdate.pl
-    else
-        # Otherwise exit without error (mysql server may not be available on
-        # this machine)
-        exit 0;
-    fi
+    # Run the ZoneMinder update tool
+    zmupdate.pl
+
 fi
 
 #DEBHELPER#
diff --git a/distros/debian8/zoneminder.postrm b/distros/debian8/zoneminder.postrm
index 45dc03c7d..358054afa 100644
--- a/distros/debian8/zoneminder.postrm
+++ b/distros/debian8/zoneminder.postrm
@@ -1,7 +1,7 @@
 #! /bin/sh
 # postrm maintainer script for zoneminder
 
-set -ex
+set -e
 
 # Source the debconf stuff
 if [ -f /usr/share/debconf/confmodule ]; then
diff --git a/distros/debian8/zoneminder.preinst b/distros/debian8/zoneminder.preinst
index 8a364952b..f9c518431 100644
--- a/distros/debian8/zoneminder.preinst
+++ b/distros/debian8/zoneminder.preinst
@@ -1,7 +1,7 @@
 #!/bin/sh
 # preinst maintainer script for zoneminder
 
-set -ex
+set -e
 
 abort=false
 if [ -L /usr/share/zoneminder/events ]; then
diff --git a/distros/debian8/zoneminder.prerm b/distros/debian8/zoneminder.prerm
index 9ce3d5b54..0adf963e5 100644
--- a/distros/debian8/zoneminder.prerm
+++ b/distros/debian8/zoneminder.prerm
@@ -1,7 +1,7 @@
 #!/bin/sh
 # prerm script for zoneminder
 
-set -ex
+set -e
 
 # Source the debconf stuff if file exists
 if [ -f /usr/share/debconf/confmodule ]; then
diff --git a/distros/debian8/zoneminder.templates b/distros/debian8/zoneminder.templates
index 8b513b3d3..9b1c21b98 100644
--- a/distros/debian8/zoneminder.templates
+++ b/distros/debian8/zoneminder.templates
@@ -1,30 +1,3 @@
-Template: zoneminder/debconf_install
-Type: boolean
-Default: true
-_Description: Configure ZoneMinder automatically?
- This configuration assistant allows you to perform automatically the basic
- configuration of ZoneMinder.
- .
- If you choose to leave this assistant, you can resume it by invoking:
- .
- $ sudo dpkg-reconfigure zoneminder
-
-Template: zoneminder/debconf_confmissingerror
-Type: error
-_Description: Configuration file is missing:
- ZoneMinder installation is corrupted.
- .
- The main configuration file '/etc/zm/zm.conf' is missing.
-
-Template: zoneminder/debconf_dbtypeerror
-Type: error
-_Description: Bad database type:
- The database type specified in the configuration file '/etc/zm/zm.conf' is
- not set to 'mysql'.
- .
- This program will abort so you can fix the configuration file and then restart
- the installation of ZoneMinder.
-
 Template: zoneminder/debconf_dblocation
 Type: select
 __Choices: local, remote
@@ -43,9 +16,9 @@ _Description: No local database server is available:
  Currently ZoneMinder supports mysql or mariadb database server but none of them
  appears to be installed on this machine.
  .
- In order to complete the installation of ZoneMinder, after ending of this
- assistant, please install a compatible database server and then restart the
- assistant by invoking:
+ In order to complete ZoneMinder's installation, after ending of this assistant,
+ please install a compatible database server and then restart the assistant by
+ invoking:
  .
  $ sudo dpkg-reconfigure zoneminder
 
@@ -53,15 +26,15 @@ Template: zoneminder/debconf_dbconfigerror
 Type: error
 _Description: Remote database servers are not allowed:
  The current configuration of dbconfig-common does not allow installation of
- databases on remote servers from this assistant.
+ a database on remote servers.
  .
- In order to reconfigure dbconfig-common, after ending of this assistant,
- please invoke:
+ In order to reconfigure dbconfig-common, please invoke the following command
+ after ending of this assistant:
  .
  $ sudo dpkg-reconfigure dbconfig-common
  .
- Then, to complete the installation of ZoneMinder, please restart this assistant
- by invoking:
+ Then, to complete ZoneMinder's installation, please restart this assistant by
+ invoking:
  .
  $ sudo dpkg-reconfigure zoneminder
 
@@ -70,8 +43,8 @@ Type: multiselect
 Choices: apache2
 Default: apache2
 _Description: Web server to reconfigure automatically:
- Please choose the web server that should be automatically configure to run
- ZoneMinder.
+ Please choose the web server that should be automatically configured for
+ ZoneMinder's web portal access.
 
 Template: zoneminder/admin_password
 Type: password