diff --git a/web/src/components/core/LoginPage.tsx b/web/src/components/core/LoginPage.tsx
index ab9a13bf6b..50e98c3290 100644
--- a/web/src/components/core/LoginPage.tsx
+++ b/web/src/components/core/LoginPage.tsx
@@ -23,16 +23,19 @@
 import React, { useState } from "react";
 import { Navigate } from "react-router-dom";
 import {
+  ActionGroup,
+  Alert,
   Bullseye,
   Button,
   Content,
-  Divider,
   Flex,
   Form,
   FormGroup,
-  Stack,
+  FormHelperText,
+  HelperText,
+  HelperTextItem,
 } from "@patternfly/react-core";
-import { FormValidationError, Page, PasswordInput } from "~/components/core";
+import { Page, PasswordInput } from "~/components/core";
 import { AuthErrors, useAuth } from "~/context/auth";
 import { _ } from "~/i18n";
 import shadowUtils from "@patternfly/react-styles/css/utilities/BoxShadow/box-shadow";
@@ -82,13 +85,8 @@ user privileges.",
     <Page.Content>
       <Bullseye>
         <Page.Section
-          pfCardProps={{
-            isCompact: false,
-            isFullHeight: false,
-            className: shadowUtils.boxShadowMd,
-          }}
-        >
-          <Stack hasGutter>
+          hasHeaderDivider
+          title={
             <Content component="h1" className={alignmentUtils.textAlignCenter}>
               <Flex
                 alignItems={{ default: "alignItemsCenter" }}
@@ -99,33 +97,42 @@ user privileges.",
                 {sectionTitle}
               </Flex>
             </Content>
-            <div>
-              <Content component="p">
-                {rootExplanationStart} <b>{rootUser}</b> {rootExplanationEnd}
-              </Content>
-              <Content component="p">
-                {_("Please, provide its password to log in to the system.")}
-              </Content>
-            </div>
-            <Divider />
-            <Form id="login" onSubmit={login} aria-label={_("Login form")}>
-              <FormGroup fieldId="password" label={_("Password")}>
-                <PasswordInput
-                  id="password"
-                  name="password"
-                  value={password}
-                  aria-label={_("Password input")}
-                  onChange={(_, v) => setPassword(v)}
-                />
-              </FormGroup>
+          }
+          pfCardProps={{
+            isCompact: false,
+            isFullHeight: false,
+            className: shadowUtils.boxShadowMd,
+          }}
+        >
+          <Form id="login" onSubmit={login} aria-label={_("Login form")}>
+            {error && <Alert variant="danger" title={errorMessage(loginError)} />}
 
-              {error && <FormValidationError message={errorMessage(loginError)} />}
+            <FormGroup fieldId="password" label={_("Password")}>
+              <PasswordInput
+                id="password"
+                name="password"
+                value={password}
+                aria-label={_("Password input")}
+                onChange={(_, v) => setPassword(v)}
+              />
+              <FormHelperText>
+                <HelperText>
+                  <HelperTextItem>
+                    {rootExplanationStart} <b>{rootUser}</b> {rootExplanationEnd}
+                  </HelperTextItem>
+                  <HelperTextItem>
+                    {_("Please, provide its password to log in to the system.")}
+                  </HelperTextItem>
+                </HelperText>
+              </FormHelperText>
+            </FormGroup>
 
+            <ActionGroup>
               <Button type="submit" variant="primary">
                 {_("Log in")}
               </Button>
-            </Form>
-          </Stack>
+            </ActionGroup>
+          </Form>
         </Page.Section>
       </Bullseye>
     </Page.Content>
diff --git a/web/src/components/core/Page.tsx b/web/src/components/core/Page.tsx
index 98b1739eb0..6929f194b5 100644
--- a/web/src/components/core/Page.tsx
+++ b/web/src/components/core/Page.tsx
@@ -54,7 +54,7 @@ import { _ } from "~/i18n";
  */
 type SectionProps = {
   /** The section title */
-  title?: string;
+  title?: React.ReactNode;
   /** The value used for accessible label */
   "aria-label"?: string;
   /** Elements to be rendered in the section footer */
diff --git a/web/src/components/core/Popup.tsx b/web/src/components/core/Popup.tsx
index 242defe744..ab2a6e3353 100644
--- a/web/src/components/core/Popup.tsx
+++ b/web/src/components/core/Popup.tsx
@@ -42,10 +42,6 @@ export type PopupProps = {
   title?: ModalHeaderProps["title"];
   /** Extra content to be placed in the header after the title */
   titleAddon?: React.ReactNode;
-  /** The block/height size for the dialog. Default is "auto". */
-  blockSize?: "auto" | "small" | "medium" | "large";
-  /** The inline/width size for the dialog. Default is "medium". */
-  inlineSize?: "auto" | "small" | "medium" | "large";
   /** Whether it should display a loading indicator instead of the requested content. */
   isLoading?: boolean;
   /** Text displayed when `isLoading` is set to `true` */
@@ -213,10 +209,6 @@ const Popup = ({
   isLoading = false,
   // TRANSLATORS: progress message
   loadingText = _("Loading data..."),
-  inlineSize = "medium",
-  blockSize = "auto",
-  variant = "medium",
-  className = "",
   children,
   ...props
 }: PopupProps) => {
@@ -230,10 +222,9 @@ const Popup = ({
   return (
     /** @ts-ignore */
     <Modal
-      variant={variant}
       {...props}
+      width={!props.variant && "auto"}
       isOpen={isOpen}
-      className={`${className} block-size-${blockSize} inline-size-${inlineSize}`.trim()}
       aria-labelledby={titleId}
       aria-describedby={contentId}
     >