diff --git a/packages/nicolium/src/components/ui/button/index.tsx b/packages/nicolium/src/components/ui/button/index.tsx
index 8ebd0f180..4a9fca70e 100644
--- a/packages/nicolium/src/components/ui/button/index.tsx
+++ b/packages/nicolium/src/components/ui/button/index.tsx
@@ -111,7 +111,6 @@ const Button = React.forwardRef<HTMLButtonElement | HTMLAnchorElement, IButton>(
           to={props.to}
           params={props.params}
           search={props.search}
-          tabIndex={-1}
         >
           {buttonChildren}
         </Link>
diff --git a/packages/nicolium/src/features/auth-login/components/login-form.tsx b/packages/nicolium/src/features/auth-login/components/login-form.tsx
index 15630e9ee..95d440a4c 100644
--- a/packages/nicolium/src/features/auth-login/components/login-form.tsx
+++ b/packages/nicolium/src/features/auth-login/components/login-form.tsx
@@ -55,7 +55,7 @@ const LoginForm: React.FC<ILoginForm> = ({ isLoading, handleSubmit }) => {
       <FormGroup
         labelText={passwordLabel}
         hintText={
-          <Link to='/reset-password' className='hover:underline' tabIndex={-1}>
+          <Link to='/reset-password' className='hover:underline'>
             <FormattedMessage id='login.reset_password_hint' defaultMessage='Trouble logging in?' />
           </Link>
         }