diff --git a/src/components/Common/SensitiveInput/index.tsx b/src/components/Common/SensitiveInput/index.tsx
index 9b19e4d0..65f48d80 100644
--- a/src/components/Common/SensitiveInput/index.tsx
+++ b/src/components/Common/SensitiveInput/index.tsx
@@ -20,7 +20,7 @@ const SensitiveInput = ({ as = 'input', ...props }: SensitiveInputProps) => {
       ? props
       : {
           ...props,
-          as: props.type === 'textarea' && !isHidden ? 'textarea' : undefined,
+          as: props.type === 'textarea' ? 'textarea' : undefined,
         };
   return (
     <>
@@ -32,11 +32,18 @@ const SensitiveInput = ({ as = 'input', ...props }: SensitiveInputProps) => {
         {...componentProps}
         className={`rounded-l-only ${componentProps.className ?? ''}`}
         type={
-          isHidden
-            ? 'password'
-            : props.type !== 'password'
-              ? (props.type ?? 'text')
-              : 'text'
+          props.type === 'textarea'
+            ? undefined
+            : isHidden
+              ? 'password'
+              : props.type !== 'password'
+                ? (props.type ?? 'text')
+                : 'text'
+        }
+        style={
+          props.type === 'textarea' && isHidden
+            ? { WebkitTextSecurity: 'disc', ...props.style }
+            : props.style
         }
       />
       <button
diff --git a/src/components/Settings/Notifications/NotificationsEmail.tsx b/src/components/Settings/Notifications/NotificationsEmail.tsx
index 6dc58359..aea40a4e 100644
--- a/src/components/Settings/Notifications/NotificationsEmail.tsx
+++ b/src/components/Settings/Notifications/NotificationsEmail.tsx
@@ -106,7 +106,7 @@ const NotificationsEmail = () => {
           otherwise: Yup.string().nullable(),
         })
         .matches(
-          /-----BEGIN PGP PRIVATE KEY BLOCK-----.+-----END PGP PRIVATE KEY BLOCK-----/,
+          /-----BEGIN PGP PRIVATE KEY BLOCK-----.+-----END PGP PRIVATE KEY BLOCK-----/s,
           intl.formatMessage(messages.validationPgpPrivateKey)
         ),
       pgpPassword: Yup.string().when('pgpPrivateKey', {