diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 6851abb40..e25f72b55 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -4,8 +4,7 @@ labels: ["feature request"]
 body:
   - type: markdown
     attributes:
-      value: |
-        "We'd love to hear your idea!  Please be sure to [search the current Issues](https://github.com/naturalcrit/homebrewery/issues) for any duplicate requests."
+      value: "We'd love to hear your idea!  Please be sure to [search the current Issues](https://github.com/naturalcrit/homebrewery/issues) for any duplicate requests."
   - type: textarea
     id: user-request
     attributes:
@@ -15,6 +14,7 @@ body:
       required: true
   - type: checkboxes
     id: terms
-    options:
-      - label: I have searched the Issues tracker for any duplicate requests and found none.
-        required: true
\ No newline at end of file
+    attributes:
+      options:
+        - label: I have searched the Issues tracker for any duplicate requests and found none.
+          required: true
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/general_issue.yml b/.github/ISSUE_TEMPLATE/general_issue.yml
index 92319ad56..c718daccc 100644
--- a/.github/ISSUE_TEMPLATE/general_issue.yml
+++ b/.github/ISSUE_TEMPLATE/general_issue.yml
@@ -12,8 +12,8 @@ body:
       options:
         - label: Legacy
         - label: v3
-      validations:
-        required: true
+    validations:
+      required: true
   - type: dropdown
     id: browser
     attributes:
@@ -25,8 +25,8 @@ body:
         - label: Edge
         - label: Safari
         - label: other
-      validations:
-        required: true
+    validations:
+      required: true
   - type: dropdown
     id: operating-system
     attributes:
@@ -37,8 +37,8 @@ body:
         - label: MacOS
         - label: Linux
         - label: other
-      validations:
-        required: true
+    validations:
+      required: true
   - type: textarea
     id: user-description
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/save_issue.yml b/.github/ISSUE_TEMPLATE/save_issue.yml
index 09136f0a7..c08f485ce 100644
--- a/.github/ISSUE_TEMPLATE/save_issue.yml
+++ b/.github/ISSUE_TEMPLATE/save_issue.yml
@@ -1,7 +1,6 @@
 name: Saving Issue
 description: Report an issue Saving
-title: "Save Error: "
-labels: ["saving"]
+labels: ["Saving"]
 body:
   - type: markdown
     attributes:
@@ -16,6 +15,8 @@ body:
     id: user-description
     attributes:
       label: "Your description of what happened:"
+    validations:
+      required: true
   - type: markdown
     attributes:
       value: |
diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index 19b33f148..d6a20527e 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -322,7 +322,7 @@ const EditPage = createClass({
 				<div className='errorContainer'>
 					Looks like there was a problem saving. <br />
 					Report the issue <a target='_blank' rel='noopener noreferrer'
-						href={`https://github.com/naturalcrit/homebrewery/issues/new?template=save_issue.yaml&error-code=${encodeURIComponent(errMsg)}`}>
+						href={`https://github.com/naturalcrit/homebrewery/issues/new?template=save_issue.yml&error-code=${encodeURIComponent(errMsg)}`}>
 						here
 					</a>.
 				</div>