diff --git a/locales/en.json b/locales/en.json
index ae2dfb1dd..520e7660e 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -121,10 +121,10 @@
     "service_no_log" : "No log to display for service '{:s}'",
     "service_cmd_exec_failed" : "Unable to execute command '{:s}'",
     "services_configured": "Configuration successfully generated",
-    "service_configuration_conflict": "The file {file:s} has been changed since its last generation. Please apply the modifications manually or use the option --force (it will erase all the modifications previously done to the file). Here are the differences:\n{diff:s}",
+    "service_configuration_conflict": "The file {file:s} has been changed since its last generation. Please apply the modifications manually or use the option --force (it will erase all the modifications previously done to the file).",
     "no_such_conf_file": "Unable to copy the file {file:s}: the file does not exist",
     "service_add_configuration": "Adding the configuration file {file:s}",
-
+    "show_diff": "Here are the differences:\n{diff:s}",
 
     "network_check_smtp_ok" : "Outbound mail (SMTP port 25) is not blocked",
     "network_check_smtp_ko" : "Outbound mail (SMTP port 25) seems to be blocked by your network",
diff --git a/src/yunohost/service.py b/src/yunohost/service.py
index 7c445ae30..3823aef4a 100644
--- a/src/yunohost/service.py
+++ b/src/yunohost/service.py
@@ -537,8 +537,9 @@ def service_safecopy(service, new_conf_file, conf_file, force=False):
     else:
         new_hash = previous_hash
         if (len(previous_hash) == 32 or previous_hash[-32:] != current_hash):
-            logger.warning(m18n.n('service_configuration_conflict',
-                file=conf_file, diff=''.join(diff)))
+            logger.warning('{0} {1}'.format(
+                m18n.n('service_configuration_conflict', file=conf_file),
+                m18n.n('show_diff', diff=''.join(diff))))
 
     # Remove the backup file if the configuration has not changed
     if new_hash == previous_hash: