diff --git a/public/app/core/components/ForgottenPassword/ChangePassword.tsx b/public/app/core/components/ForgottenPassword/ChangePassword.tsx
index b81387753d7..5561a227471 100644
--- a/public/app/core/components/ForgottenPassword/ChangePassword.tsx
+++ b/public/app/core/components/ForgottenPassword/ChangePassword.tsx
@@ -91,7 +91,13 @@ export const ChangePassword = ({ onSubmit, onSkip, showDefaultPasswordWarning }:
             content="If you skip you will be prompted to change password next time you log in."
             placement="bottom"
           >
-            <Button fill="text" onClick={onSkip} type="button" data-testid={selectors.pages.Login.skip}>
+            <Button
+              className={styles.skipButton}
+              fill="text"
+              onClick={onSkip}
+              type="button"
+              data-testid={selectors.pages.Login.skip}
+            >
               Skip
             </Button>
           </Tooltip>
diff --git a/public/app/core/components/Login/LoginForm.tsx b/public/app/core/components/Login/LoginForm.tsx
index ffaa9d452ac..4524e997442 100644
--- a/public/app/core/components/Login/LoginForm.tsx
+++ b/public/app/core/components/Login/LoginForm.tsx
@@ -83,5 +83,9 @@ export const getStyles = (theme: GrafanaTheme2) => {
       justifyContent: 'center',
       width: '100%',
     }),
+
+    skipButton: css({
+      alignSelf: 'flex-start',
+    }),
   };
 };