diff --git a/packages/grafana-ui/src/components/Button/Button.tsx b/packages/grafana-ui/src/components/Button/Button.tsx
index 0cb13a99ea6..d65274842c5 100644
--- a/packages/grafana-ui/src/components/Button/Button.tsx
+++ b/packages/grafana-ui/src/components/Button/Button.tsx
@@ -51,7 +51,6 @@ const getPropertiesForVariant = (theme: GrafanaTheme, variant: ButtonVariant) =>
         variantStyles: css`
           &:focus {
             outline: none;
-            box-shadow: none;
           }
         `,
       };
diff --git a/public/app/core/components/ForgottenPassword/ChangePassword.tsx b/public/app/core/components/ForgottenPassword/ChangePassword.tsx
index 1e6faab9447..d72dcf0645d 100644
--- a/public/app/core/components/ForgottenPassword/ChangePassword.tsx
+++ b/public/app/core/components/ForgottenPassword/ChangePassword.tsx
@@ -1,5 +1,5 @@
 import React, { FC, SyntheticEvent } from 'react';
-import { Tooltip, Form, Field, Input, VerticalGroup, Button, LinkButton } from '@grafana/ui';
+import { Tooltip, Form, Field, Input, VerticalGroup, Button } from '@grafana/ui';
 import { selectors } from '@grafana/e2e-selectors';
 import { submitButton } from '../Login/LoginForm';
 interface Props {
@@ -50,9 +50,9 @@ export const ChangePassword: FC<Props> = ({ onSubmit, onSkip }) => {
                 content="If you skip you will be prompted to change password next time you log in."
                 placement="bottom"
               >
-                <LinkButton variant="link" onClick={onSkip} aria-label={selectors.pages.Login.skip}>
+                <Button variant="link" onClick={onSkip} type="button" aria-label={selectors.pages.Login.skip}>
                   Skip
-                </LinkButton>
+                </Button>
               </Tooltip>
             )}
           </VerticalGroup>