diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 490a9bf729..54ca0f7edb 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,22 +1,34 @@
-#### FreeCodeCamp Issue template
-To Use this Template:
-* Fill out what you can
-* Delete what you do not fill out
+<!--
+FreeCodeCamp Issue Template
+NOTE: ISSUES ARE NOT FOR CODE HELP - Ask for Help at
+https://gitter.im/FreeCodeCamp/Help
+-->
+
+#### Challenge Name
+
+<!-- Insert link to challenge below -->
 
-NOTE: ISSUES ARE NOT FOR CODE HELP - Ask for Help at https://gitter.im/FreeCodeCamp/Help
 
 #### Issue Description
-* When Issue Happens
-* Steps To Reproduce
+
+<!-- Describe below when the issue happens and how to reproduce it -->
+
 
 #### Browser Information
-* Browser Name, Version
-* Operating System
+
+<!-- Describe your workspace in which you are having issues-->
+
+* Browser Name, Version: 
+* Operating System: 
+* Mobile, Desktop, or Tablet: 
 
 #### Your Code
 
 ```js
-If relevant, paste all of your challenge code in here
+// If relevant, paste all of your challenge code in here
+
 ```
 
 #### Screenshot
+
+
diff --git a/server/middlewares/migrate-completed-challenges.js b/server/middlewares/migrate-completed-challenges.js
index a5f7110f86..9085b98f23 100644
--- a/server/middlewares/migrate-completed-challenges.js
+++ b/server/middlewares/migrate-completed-challenges.js
@@ -104,11 +104,19 @@ export default function migrateCompletedChallenges() {
     if (!user || user.isChallengeMapMigrated) {
       return next();
     }
-    return buildChallengeMap(
-      user.id.toString(),
-      user.completedChallenges,
-      User
-    )
+    const id = user.id.toString();
+    return User.findOne$({
+      where: { id },
+      fields: { completedChallenges: true }
+    })
+      .map(({ completedChallenges = [] } = {}) => completedChallenges)
+      .flatMap(completedChallenges => {
+        return buildChallengeMap(
+          id,
+          completedChallenges,
+          User
+        );
+      })
       .subscribe(
         count => log('documents update', count),
         // errors go here