diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..0115046e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,21 @@
+### Expected behavior
+Describe.
+
+### Actual behavior
+Describe.
+
+### Steps to reproduce the problem
+- TBD.
+- TBD.
+- TBD.
+
+### Screenshot/screencast
+Attach or link a resource.
+
+--
+
+#### Environment
+- OS:
+- Browser (w/version):
+- User role (client, copilot or manager):
+- Account used: 
diff --git a/.github/ISSUE_TEMPLATE/may-7-bug-hunt-functionality-bug.md b/.github/ISSUE_TEMPLATE/may-7-bug-hunt-functionality-bug.md
deleted file mode 100644
index 394a5c83..00000000
--- a/.github/ISSUE_TEMPLATE/may-7-bug-hunt-functionality-bug.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: May 7 Bug Hunt functionality bug
-about: May 7 bug hunt template
-title: ''
-labels: Functional, May 7 Bug Hunt
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce / Actual Behavior**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/may-7-bug-hunt-security-bug.md b/.github/ISSUE_TEMPLATE/may-7-bug-hunt-security-bug.md
deleted file mode 100644
index bec2779f..00000000
--- a/.github/ISSUE_TEMPLATE/may-7-bug-hunt-security-bug.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: May 7 Bug Hunt security bug
-about: May 7 bug hunt template
-title: ''
-labels: May 7 Bug Hunt, Security
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce / Actual Behavior**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/may-7-bug-hunt-suggestion.md b/.github/ISSUE_TEMPLATE/may-7-bug-hunt-suggestion.md
deleted file mode 100644
index 4d73a5e1..00000000
--- a/.github/ISSUE_TEMPLATE/may-7-bug-hunt-suggestion.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-name: May 7 Bug Hunt suggestion
-about: May 7 bug hunt template
-title: ''
-labels: May 7 Bug Hunt, Suggestion
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the suggestion is.
-
-**To Reproduce / Actual Behavior**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you suggest to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your suggestion.
-
-**Additional context**
-Add any other context about the suggestion here.
diff --git a/.github/ISSUE_TEMPLATE/may-7-bug-hunt-user-interface-bug.md b/.github/ISSUE_TEMPLATE/may-7-bug-hunt-user-interface-bug.md
deleted file mode 100644
index 16e78989..00000000
--- a/.github/ISSUE_TEMPLATE/may-7-bug-hunt-user-interface-bug.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: May 7 Bug Hunt user interface bug
-about: May 7 bug hunt template
-title: ''
-labels: May 7 Bug Hunt, User Interface
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce / Actual Behavior**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots or Video**
-If applicable, add screenshots or video to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/src/components/ChallengeEditor/TextEditor-Field/index.js b/src/components/ChallengeEditor/TextEditor-Field/index.js
index 531e1ed1..d5c53628 100644
--- a/src/components/ChallengeEditor/TextEditor-Field/index.js
+++ b/src/components/ChallengeEditor/TextEditor-Field/index.js
@@ -52,7 +52,7 @@ class TextEditorField extends Component {
             readOnly={readOnly}
           />
         </div>)}
-        {challenge.submitTriggered && !challenge.description && (
+        {challenge.submitTriggered && (challenge.description || '').trim().length === 0 && (
           <div className={styles.error}>Public Specification is required</div>
         )}
         {!readOnly && shouldShowPrivateDescription && !showShowPrivateDescriptionField && (<div className={styles.button} onClick={this.addNewPrivateDescription}>
diff --git a/src/components/ChallengeEditor/index.js b/src/components/ChallengeEditor/index.js
index b24a55f6..0b945a38 100644
--- a/src/components/ChallengeEditor/index.js
+++ b/src/components/ChallengeEditor/index.js
@@ -673,7 +673,10 @@ class ChallengeEditor extends Component {
       const value = challenge[key]
 
       // this check works for string and array values
-      isRequiredMissing = isRequiredMissing || !value || !value.length
+      isRequiredMissing = isRequiredMissing ||
+        !value ||
+        (_.isString(value) && value.trim().length === 0) ||
+        (_.isArray(value) && value.length === 0)
     })
 
     return !(isRequiredMissing || _.isEmpty(this.state.currentTemplate))