diff --git a/src/components/MaintenanceMode.js b/src/components/MaintenanceMode.js
index 8b3734e2f..b13933615 100644
--- a/src/components/MaintenanceMode.js
+++ b/src/components/MaintenanceMode.js
@@ -2,14 +2,11 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import {FormattedMessage} from 'react-intl';
 
-import Body from 'components/Body';
 import Card from 'components/Card';
-import FAIcon from 'components/FAIcon';
+import ErrorMessage from 'components/Errors/ErrorMessage';
 import {IsFormDesigner} from 'headers';
-import {getBEMClassName} from 'utils';
 
 const MaintenanceModeAlert = () => {
-  const alertClassName = getBEMClassName('alert', ['info']);
   const userIsFormDesigner = IsFormDesigner.getValue();
 
   let message;
@@ -32,14 +29,7 @@ const MaintenanceModeAlert = () => {
     );
   }
 
-  return (
-    <div className={alertClassName}>
-      <span className={getBEMClassName('alert__icon')}>
-        <FAIcon icon="info" />
-      </span>
-      <Body>{message}</Body>
-    </div>
-  );
+  return <ErrorMessage modifier="info">{message}</ErrorMessage>;
 };
 
 const MaintenanceMode = ({title, asToast = false}) => {
diff --git a/src/components/auth/AuthenticationOutage.js b/src/components/auth/AuthenticationOutage.js
index ce14c8c41..d467b1d5d 100644
--- a/src/components/auth/AuthenticationOutage.js
+++ b/src/components/auth/AuthenticationOutage.js
@@ -2,10 +2,8 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import {FormattedMessage} from 'react-intl';
 
-import Body from 'components/Body';
-import FAIcon from 'components/FAIcon';
+import ErrorMessage from 'components/Errors/ErrorMessage';
 import useQuery from 'hooks/useQuery';
-import {getBEMClassName} from 'utils';
 
 const AUTHENTICATION_OUTAGE_QUERY_PARAM = 'of-auth-problem';
 
@@ -15,20 +13,15 @@ export const useDetectAuthenticationOutage = () => {
 };
 
 const AuthenticationOutage = ({loginOption}) => (
-  <div className={getBEMClassName('alert', ['error'])}>
-    <span className={getBEMClassName('alert__icon', ['wide'])}>
-      <FAIcon icon="exclamation-circle" />
-    </span>
-    <Body>
-      <FormattedMessage
-        description="Authentication outage message"
-        defaultMessage={`
+  <ErrorMessage>
+    <FormattedMessage
+      description="Authentication outage message"
+      defaultMessage={`
           This form is temporarily unavailable because of an outage with the {label}
           authentication service. Please try again later.`}
-        values={{label: loginOption.label}}
-      />
-    </Body>
-  </div>
+      values={{label: loginOption.label}}
+    />
+  </ErrorMessage>
 );
 
 AuthenticationOutage.propTypes = {
