diff --git a/ts/components/session/SessionPasswordPrompt.tsx b/ts/components/session/SessionPasswordPrompt.tsx
index a48af57ce..4cf06c425 100644
--- a/ts/components/session/SessionPasswordPrompt.tsx
+++ b/ts/components/session/SessionPasswordPrompt.tsx
@@ -57,8 +57,8 @@ export class SessionPasswordPrompt extends React.PureComponent<{}, State> {
         id="password-prompt-input"
         type="password"
         autoFocus={true}
-        placeholder=" "
         defaultValue=""
+        placeholder={' '}
         maxLength={window.CONSTANTS.MAX_PASSWORD_LENGTH}
       />
     );
diff --git a/ts/components/session/settings/SessionSettings.tsx b/ts/components/session/settings/SessionSettings.tsx
index 9b3168911..b0623fdef 100644
--- a/ts/components/session/settings/SessionSettings.tsx
+++ b/ts/components/session/settings/SessionSettings.tsx
@@ -156,6 +156,7 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
             id="password-lock-input"
             defaultValue=""
             placeholder={' '}
+            maxLength={window.CONSTANTS.MAX_PASSWORD_LENGTH}
           />
 
           <div className="spacer-xs" />