diff --git a/src/app/features/issue/github/github.const.ts b/src/app/features/issue/github/github.const.ts
index 7159be7286..93f2c92923 100644
--- a/src/app/features/issue/github/github.const.ts
+++ b/src/app/features/issue/github/github.const.ts
@@ -2,8 +2,7 @@
 import {GithubCfg} from './github';
 import {FormlyFieldConfig} from '@ngx-formly/core';
 import {T} from '../../../t.const';
-import {ConfigFormConfig, ConfigFormSection} from '../../config/global-config.model';
-import {GITHUB_TYPE} from '../issue.const';
+import {ConfigFormSection} from '../../config/global-config.model';
 
 export const DEFAULT_GITHUB_CFG: GithubCfg = {
   repo: null,
@@ -55,10 +54,7 @@ export const GITHUB_CONFIG_FORM: FormlyFieldConfig[] = [
 
 export const GITHUB_CONFIG_FORM_SECTION: ConfigFormSection = {
   title: 'Github',
-  key: GITHUB_TYPE,
+  key: 'GITHUB',
   items: GITHUB_CONFIG_FORM,
-  /* tslint:disable */
-  help: `<p>Here you can configure SuperProductivity to list open GithHub issues for a specific repository in the task creation panel in the daily planning view. They will be listed as suggestions and will provide a link to the issue as well as more information about it.</p>
-  <p>In addition you can automatically add and sync all open issues to your task backlog.</p>`,
-  /* tslint:enable */
+  help: T.F.GITHUB.FORM_SECTION.HELP,
 };
diff --git a/src/app/features/issue/issue.const.ts b/src/app/features/issue/issue.const.ts
index 6101d74387..84ff5c3566 100644
--- a/src/app/features/issue/issue.const.ts
+++ b/src/app/features/issue/issue.const.ts
@@ -1,12 +1,7 @@
 import {ConfigFormConfig} from '../config/global-config.model';
-import {
-  DEFAULT_JIRA_CFG,
-  JIRA_ADVANCED_FORM_CFG,
-  JIRA_CONFIG_FORM_SECTION,
-  JIRA_CREDENTIALS_FORM_CFG
-} from './jira/jira.const';
+import {DEFAULT_JIRA_CFG, JIRA_CONFIG_FORM_SECTION} from './jira/jira.const';
 import {IssueProviderKey} from './issue';
-import {DEFAULT_GITHUB_CFG, GITHUB_CONFIG_FORM, GITHUB_CONFIG_FORM_SECTION} from './github/github.const';
+import {DEFAULT_GITHUB_CFG, GITHUB_CONFIG_FORM_SECTION} from './github/github.const';
 import {T} from '../../t.const';
 
 export const LEGACY_GITHUB_TYPE = 'GIT';
diff --git a/src/app/features/issue/jira/jira.const.ts b/src/app/features/issue/jira/jira.const.ts
index fb89b39269..f2971e9125 100644
--- a/src/app/features/issue/jira/jira.const.ts
+++ b/src/app/features/issue/jira/jira.const.ts
@@ -3,7 +3,6 @@ import {JiraCfg} from './jira';
 import {FormlyFieldConfig} from '@ngx-formly/core';
 import {GITHUB_INITIAL_POLL_DELAY} from '../github/github.const';
 import {T} from '../../../t.const';
-import {JIRA_TYPE} from '../issue.const';
 import {ConfigFormSection} from '../../config/global-config.model';
 
 export const JIRA_DATETIME_FORMAT = 'YYYY-MM-DDTHH:mm:ss.SSZZ';
@@ -175,7 +174,7 @@ export const JIRA_ADVANCED_FORM_CFG: FormlyFieldConfig[] = [
 
 export const JIRA_CONFIG_FORM_SECTION: ConfigFormSection = {
   title: 'Jira',
-  key: JIRA_TYPE,
+  key: 'JIRA',
   customSection: 'JIRA_CFG',
   /* tslint:disable */
   help: `<div class="mat-caption">Basic configuration</div>
diff --git a/src/app/t.const.ts b/src/app/t.const.ts
index 3909e0b333..9c05fcffa1 100644
--- a/src/app/t.const.ts
+++ b/src/app/t.const.ts
@@ -66,6 +66,10 @@ export const T = {
         'IS_SEARCH_ISSUES_FROM_GITHUB': 'F.GITHUB.FORM.IS_SEARCH_ISSUES_FROM_GITHUB',
         'REPO': 'F.GITHUB.FORM.REPO'
       },
+      'FORM_SECTION': {
+        'TITLE': 'F.GITHUB.FORM_SECTION.TITLE',
+        'HELP': 'F.GITHUB.FORM_SECTION.HELP'
+      },
       'ISSUE_CONTENT': {
         'ASSIGNEE': 'F.GITHUB.ISSUE_CONTENT.ASSIGNEE',
         'AT': 'F.GITHUB.ISSUE_CONTENT.AT',
@@ -90,6 +94,7 @@ export const T = {
     },
     'JIRA': {
       'EXTENSION_INFO': 'F.JIRA.EXTENSION_INFO',
+      'FORM_HELP': 'F.JIRA.FORM_HELP',
       'CFG_CMP': {
         'ENABLE': 'F.JIRA.CFG_CMP.ENABLE',
         'ENABLE_TRANSITIONS': 'F.JIRA.CFG_CMP.ENABLE_TRANSITIONS',
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 2c86352555..37afdd2dfe 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -66,6 +66,10 @@
         "IS_SEARCH_ISSUES_FROM_GITHUB": "Show issues from git as suggestions when adding new tasks",
         "REPO": "\"username/repositoryName\" for the git repository you want to track"
       },
+      "FORM_SECTION": {
+        "TITLE": "Github",
+        "HELP": "<p>Here you can configure SuperProductivity to list open GithHub issues for a specific repository in the task creation panel in the daily planning view. They will be listed as suggestions and will provide a link to the issue as well as more information about it.</p> <p>In addition you can automatically add and sync all open issues to your task backlog.</p>"
+      },
       "ISSUE_CONTENT": {
         "ASSIGNEE": "Assignee",
         "AT": "at",