diff --git a/packages/webapp/src/components/maps-page/account-menu/change-password-dialog/index.tsx b/packages/webapp/src/components/maps-page/account-menu/change-password-dialog/index.tsx
index eab3e067..246ed856 100644
--- a/packages/webapp/src/components/maps-page/account-menu/change-password-dialog/index.tsx
+++ b/packages/webapp/src/components/maps-page/account-menu/change-password-dialog/index.tsx
@@ -94,6 +94,7 @@ const ChangePasswordDialog = ({ onClose }: ChangePasswordDialogProps): React.Rea
           error={error}
           fullWidth={true}
           autoComplete="new-password"
+          maxLength={30}
         />
 
         <Input
diff --git a/packages/webapp/src/components/registration-page/index.tsx b/packages/webapp/src/components/registration-page/index.tsx
index 5ca9a26c..d687ea7a 100644
--- a/packages/webapp/src/components/registration-page/index.tsx
+++ b/packages/webapp/src/components/registration-page/index.tsx
@@ -156,6 +156,7 @@ const RegistrationForm = () => {
                 })}
                 autoComplete="new-password"
                 error={error}
+                maxLength={30}
               />
 
               {AppConfig.isRecaptcha2Enabled() && (