diff --git a/src/pages/LockersRegistration.jsx b/src/pages/LockersRegistration.jsx
index a66c5b8..bf5b8c8 100644
--- a/src/pages/LockersRegistration.jsx
+++ b/src/pages/LockersRegistration.jsx
@@ -20,7 +20,7 @@ function LockersRegistration() {
   const noOfLockers = location.state?.noOfLockers;
   const cabinetId = location.state?.cabinetId;
 
-  const initLockers = Array(noOfLockers ? parseInt(noOfLockers) : 0)
+  const initLockers = Array(noOfLockers)
     .fill()
     .map(() => ({
       id: "",
@@ -163,9 +163,9 @@ function LockersRegistration() {
     const valid = lockerValues[`${field.name}Valid`];
 
     return field.type === "input" ? (
-      <FormInput props={commonProps} valid={valid} />
+      <FormInput key={field.name} props={commonProps} valid={valid} />
     ) : (
-      <FormSelect props={commonProps} valid={valid} options={field.options} />
+      <FormSelect key={field.name} props={commonProps} valid={valid} options={field.options} />
     );
   };