diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index 21d9efc641..9d6f40bef0 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -269,7 +269,7 @@ export async function createRouter(
         }
         if (kind.toLowerCase() !== 'template') {
           throw new InputError(
-            `Invalid kind, only 'template' kind is supported`,
+            `Invalid kind, only 'Template' kind is supported`,
           );
         }
 
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
index 71084a1eda..eb51e86d59 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
@@ -74,7 +74,6 @@ export const MultistepJsonForm = ({
             </StepLabel>
             <StepContent key={title}>
               <Form
-                key={title}
                 noHtml5Validate
                 formData={formData}
                 onChange={onChange}