diff --git a/src/components/Wizard/MetadataConfirm/MetadataConfirm.tsx b/src/components/Wizard/MetadataConfirm/MetadataConfirm.tsx
index f1bce9d..904c1be 100644
--- a/src/components/Wizard/MetadataConfirm/MetadataConfirm.tsx
+++ b/src/components/Wizard/MetadataConfirm/MetadataConfirm.tsx
@@ -117,7 +117,7 @@ export const MetadataConfirm: React.FC<WizardStepProps> = ({
             </Typography>
           ))}
         </Box>
-        <form className="form">
+        <Box className="form">
           <Box className="formGroup">
             <label htmlFor="password">
               <FormattedMessage id="form.password.label" />
@@ -128,13 +128,19 @@ export const MetadataConfirm: React.FC<WizardStepProps> = ({
               name="password"
               value={formData.password}
               onChange={handleChange}
+              onKeyDown={(e: React.KeyboardEvent<HTMLInputElement>): void => {
+                const SUBMIT_KEY = 'Enter';
+                if (formData.password && e.key === SUBMIT_KEY) {
+                  setShouldSubmit?.(true);
+                }
+              }}
               required
               className="textField"
               placeholder={intl.formatMessage({ id: 'form.password.placeholder' })}
               autoComplete="off"
             />
           </Box>
-        </form>
+        </Box>
       </Box>
     </Box>
   );
diff --git a/src/components/Wizard/MetadataForm/MetadataForm.tsx b/src/components/Wizard/MetadataForm/MetadataForm.tsx
index 51206d6..7986beb 100644
--- a/src/components/Wizard/MetadataForm/MetadataForm.tsx
+++ b/src/components/Wizard/MetadataForm/MetadataForm.tsx
@@ -57,7 +57,7 @@ export const MetadataForm: React.FC<WizardStepProps> = ({
             id={`${selectedItem?.isApproved ? 'form.message.reject' : 'form.message.approve'}`}
           />
         </Box>
-        <form className="form">
+        <Box className="form">
           <Box className="formGroup">
             <label htmlFor="approver">
               <FormattedMessage id="form.approver.label" />
@@ -88,7 +88,7 @@ export const MetadataForm: React.FC<WizardStepProps> = ({
               placeholder={intl.formatMessage({ id: 'form.remarks.placeholder' })}
             />
           </Box>
-        </form>
+        </Box>
       </Box>
     </Box>
   );
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 14300b9..78bb69a 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -3,6 +3,7 @@
 
   "err.code.INVALID_CREDENTIALS": "Invalid username or password",
   "err.code.INVALID_RECORD_NAME": "Model not found",
+  "err.code.INVALID_RECORD_NAME_ANOTHER_SITE": "Model not found in all site(s)",
 
   "auth.login.btn": "Login",
   "auth.logout.btn": "Logout",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index bae8297..ff11b94 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -3,6 +3,7 @@
 
   "err.code.INVALID_CREDENTIALS": "שם משתמש או סיסמה לא חוקיים",
   "err.code.INVALID_RECORD_NAME": "מודל לא קיים",
+  "err.code.INVALID_RECORD_NAME_ANOTHER_SITE": "מודל לא קיים בכל האתרים",
 
   "auth.login.btn": "התחבר",
   "auth.logout.btn": "התנתק",