diff --git a/web/src/components/core/EmptyState.jsx b/web/src/components/core/EmptyState.jsx
index 487a9279c4..e147766895 100644
--- a/web/src/components/core/EmptyState.jsx
+++ b/web/src/components/core/EmptyState.jsx
@@ -22,7 +22,7 @@
 // @ts-check
 
 import React from "react";
-import { EmptyState, EmptyStateHeader, EmptyStateBody, Flex } from "@patternfly/react-core";
+import { EmptyState, EmptyStateHeader, EmptyStateBody, Stack } from "@patternfly/react-core";
 import { Icon } from "~/components/layout";
 
 /**
@@ -68,9 +68,7 @@ export default function EmptyStateWrapper({
         icon={<Icon name={icon} size="xxl" color={color} />}
       />
       <EmptyStateBody>
-        <Flex rowGap={{ default: "rowGapMd" }} justifyContent={{ default: "justifyContentCenter" }}>
-          {children}
-        </Flex>
+        <Stack hasGutter>{children}</Stack>
       </EmptyStateBody>
     </EmptyState>
   );
diff --git a/web/src/components/core/LoginPage.jsx b/web/src/components/core/LoginPage.jsx
index 76acd31cb8..1ff500b7c1 100644
--- a/web/src/components/core/LoginPage.jsx
+++ b/web/src/components/core/LoginPage.jsx
@@ -92,27 +92,25 @@ user privileges.",
                   {rootExplanationStart} <b>{rootUser}</b> {rootExplanationEnd}
                 </p>
                 <p>{_("Please, provide its password to log in to the system.")}</p>
-                <Stack hasGutter>
-                  <Form id="login" onSubmit={login} aria-label={_("Login form")}>
-                    <FormGroup fieldId="password">
-                      <PasswordInput
-                        id="password"
-                        name="password"
-                        value={password}
-                        aria-label={_("Password input")}
-                        onChange={(_, v) => setPassword(v)}
-                      />
-                    </FormGroup>
+                <Form id="login" onSubmit={login} aria-label={_("Login form")}>
+                  <FormGroup fieldId="password">
+                    <PasswordInput
+                      id="password"
+                      name="password"
+                      value={password}
+                      aria-label={_("Password input")}
+                      onChange={(_, v) => setPassword(v)}
+                    />
+                  </FormGroup>
 
-                    {error && <FormValidationError message={errorMessage(loginError)} />}
+                  {error && <FormValidationError message={errorMessage(loginError)} />}
 
-                    <ActionGroup>
-                      <Button type="submit" variant="primary">
-                        {_("Log in")}
-                      </Button>
-                    </ActionGroup>
-                  </Form>
-                </Stack>
+                  <ActionGroup>
+                    <Button type="submit" variant="primary">
+                      {_("Log in")}
+                    </Button>
+                  </ActionGroup>
+                </Form>
               </EmptyState>
               <Flex>
                 <FlexItem align={{ default: "alignRight" }}>