diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index ec1adc8dfb..67e0c97a7f 100755
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,16 +1,36 @@
-**Node.js version**:
+<!-- Chose BUG or FEATURE REQUEST template and delete the one you don't use-->
+<!-- ⚠️ Don't forgot the checkbox at the end of your issue -->
 
-**npm version**:
+*BUG TEMPLATE* <!-- Delete this header from your issue -->
 
-**Strapi version**:
+<!-- ⚠️ Before writing your issue make sure you are using :-->
+<!-- Node 9.x.x -->
+<!-- npm 5.x.x -->
+<!-- The latest version of Strapi -->
 
-**Operating system**:
-
-
-**Do you want to request a *feature* or report a *bug*?**
+**Informations**
+- **Node.js version**:
+- **npm version**:
+- **Strapi version**:
+- **Database**:
+- **Operating system**:
 
 **What is the current behavior?**
 
-**If the current behavior is a bug, please provide the steps to reproduce the problem**
+**Steps to reproduce the problem**
 
 **What is the expected behavior?**
+
+**Suggested solutions**
+
+---
+
+*FEATURE REQUEST TEMPLATE*  <!-- Delete this header from your issue -->
+
+**What is the expected behavior?**
+
+---
+
+- [ ] I'm sure that this issue hasn't already been referenced
+<!-- ⬆️ Don't delete this checkbox from your issue and approve it.  -->
+<!-- ⚠️ Make sure to browse the opened and closed issues. -->
diff --git a/packages/strapi-plugin-settings-manager/admin/src/translations/en.json b/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
index 13d6812e26..71e53991fe 100755
--- a/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
+++ b/packages/strapi-plugin-settings-manager/admin/src/translations/en.json
@@ -111,6 +111,7 @@
   "form.language.choose": "Choose a language:",
 
   "request.error.database.exist": "This connection already exists",
+  "request.error.database.unknow": "No such connection",
   "request.error.type.string": "A text is required.",
   "request.error.type.number": "A number is required.",
   "request.error.type.boolean": "A boolean is required.",
diff --git a/packages/strapi-plugin-settings-manager/admin/src/translations/pl.json b/packages/strapi-plugin-settings-manager/admin/src/translations/pl.json
index 9e637de1e7..65d6ab1a05 100644
--- a/packages/strapi-plugin-settings-manager/admin/src/translations/pl.json
+++ b/packages/strapi-plugin-settings-manager/admin/src/translations/pl.json
@@ -111,6 +111,7 @@
   "form.language.choose": "Nazwa:",
 
   "request.error.database.exist": "Takie połączenie już istnieje",
+  "request.error.database.unknow": "Takie połączenie nie istnieje",
   "request.error.type.string": "Tekst jest wymagany.",
   "request.error.type.number": "Liczba jest wymagana.",
   "request.error.type.boolean": "Typ logiczny jest wymagany.",
diff --git a/packages/strapi-plugin-settings-manager/controllers/SettingsManager.js b/packages/strapi-plugin-settings-manager/controllers/SettingsManager.js
index 0ce5cb12ad..b90b2d48aa 100755
--- a/packages/strapi-plugin-settings-manager/controllers/SettingsManager.js
+++ b/packages/strapi-plugin-settings-manager/controllers/SettingsManager.js
@@ -27,7 +27,7 @@ module.exports = {
     const Service = strapi.plugins['settings-manager'].services.settingsmanager;
     const { env } = ctx.params;
 
-    if (!env || _.isEmpty(_.find(Service.getEnvironments(), { name: env }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.environment.unknown' }] }]);
+    if (!env || _.isEmpty(_.find(Service.getEnvironments(), { name: env }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.environment.unknow' }] }]);
 
     ctx.send({ databases: Service.getDatabases(env) });
   },
@@ -36,7 +36,7 @@ module.exports = {
     const Service = strapi.plugins['settings-manager'].services.settingsmanager;
     const { name, env } = ctx.params;
 
-    if (!env || _.isEmpty(_.find(Service.getEnvironments(), { name: env }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.environment.unknown' }] }]);
+    if (!env || _.isEmpty(_.find(Service.getEnvironments(), { name: env }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.environment.unknow' }] }]);
     if (!name || _.isEmpty(_.find(Service.getDatabases(env), { name }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.database.unknow' }] }]);
 
     const model = Service.databases(name, env);
@@ -57,7 +57,7 @@ module.exports = {
     const Service = strapi.plugins['settings-manager'].services.settingsmanager;
     const { slug, env } = ctx.params;
 
-    if (env && _.isEmpty(_.find(Service.getEnvironments(), { name: env }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.environment.unknown' }] }]);
+    if (env && _.isEmpty(_.find(Service.getEnvironments(), { name: env }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.environment.unknow' }] }]);
 
     _.has(Service, slug) ? ctx.send(await Service[slug](env)) : ctx.badRequest(null, [{ messages: [{ id: 'request.error.config' }] }]);
   },
@@ -67,7 +67,7 @@ module.exports = {
     const { slug, env } = ctx.params;
     let params = ctx.request.body;
 
-    if (env && _.isEmpty(_.find(Service.getEnvironments(), { name: env }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.environment.unknown' }] }]);
+    if (env && _.isEmpty(_.find(Service.getEnvironments(), { name: env }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.environment.unknow' }] }]);
 
     let model;
     if (_.has(Service, slug)) {
@@ -153,7 +153,7 @@ module.exports = {
     const { env } = ctx.params;
     let params = ctx.request.body;
 
-    if (!env || _.isEmpty(_.find(Service.getEnvironments(), { name: env }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.environment.unknown' }] }]);
+    if (!env || _.isEmpty(_.find(Service.getEnvironments(), { name: env }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.environment.unknow' }] }]);
 
     const [name] = _.keys(params.database.connections);
 
@@ -196,7 +196,7 @@ module.exports = {
     const { name, env } = ctx.params;
     let params = ctx.request.body;
 
-    if (!env || _.isEmpty(_.find(Service.getEnvironments(), { name: env }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.environment.unknown' }] }]);
+    if (!env || _.isEmpty(_.find(Service.getEnvironments(), { name: env }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.environment.unknow' }] }]);
     if (!name || _.isEmpty(_.find(Service.getDatabases(env), { name }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.database.unknow' }] }]);
 
     const model = Service.databases(name, env);
@@ -304,7 +304,7 @@ module.exports = {
     const Service = strapi.plugins['settings-manager'].services.settingsmanager;
     const { name, env } = ctx.params;
 
-    if (!env || _.isEmpty(_.find(Service.getEnvironments(), { name: env }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.environment.unknown' }] }]);
+    if (!env || _.isEmpty(_.find(Service.getEnvironments(), { name: env }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.environment.unknow' }] }]);
     if (!name || _.isEmpty(_.find(Service.getDatabases(env), { name }))) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.database.unknow' }] }]);
 
     const connections = _.clone(strapi.config.environments[env].database.connections);