diff --git a/ui/src/components/views/auth/auth-ldap-page.tsx b/ui/src/components/views/auth/auth-ldap-page.tsx
index 75adcf917..eb1a21ca8 100644
--- a/ui/src/components/views/auth/auth-ldap-page.tsx
+++ b/ui/src/components/views/auth/auth-ldap-page.tsx
@@ -21,7 +21,7 @@ export const AuthLdapPage = () => {
   const [usernameError, setUsernameError] = useState('')
   const [passwordError, setPasswordError] = useState('')
   const [formError, setFormError] = useState('')
-  const { data: authData, error, mutate: auth, isSuccess } = useLdapAuth()
+  const { data: authData, error, mutate: auth, isSuccess, isPending } = useLdapAuth()
   const { data: authContact } = useGetAuthContact()
 
   const onFormSubmit = async (event: FormEvent<HTMLFormElement>) => {
@@ -51,8 +51,8 @@ export const AuthLdapPage = () => {
   }, [authData])
 
   useEffect(() => {
-    if (error?.response?.data.error === 'ValidationError') {
-      for (const item of error.response.data.validationErrors) {
+    if (error?.data.error === 'ValidationError') {
+      for (const item of error.data.validationErrors) {
         if (item.param === 'username') {
           setUsernameError(item.msg)
         }
@@ -65,13 +65,13 @@ export const AuthLdapPage = () => {
       return
     }
 
-    if (error?.response?.data.error === 'InvalidCredentialsError') {
+    if (error?.data.error === 'InvalidCredentialsError') {
       setFormError('Incorrect login details')
 
       return
     }
 
-    if (error?.response?.data.error) {
+    if (error?.data.error) {
       setFormError('We do not recognize you. Please check your spelling and try again or use another login option')
     }
   }, [error])
@@ -113,7 +113,8 @@ export const AuthLdapPage = () => {
                 <Spacing size='xl' />
                 <FormItem>
                   <Button
-                    disabled={!username || !password || !!usernameError || !!passwordError || !!formError}
+                    disabled={!username || !password || !!usernameError || !!passwordError || isPending}
+                    loading={isPending}
                     size='l'
                     type='submit'
                     stretched
diff --git a/ui/src/lib/hooks/use-ldap-auth.hook.ts b/ui/src/lib/hooks/use-ldap-auth.hook.ts
index 142468b81..6a4d99b82 100644
--- a/ui/src/lib/hooks/use-ldap-auth.hook.ts
+++ b/ui/src/lib/hooks/use-ldap-auth.hook.ts
@@ -2,12 +2,12 @@ import { useMutation } from '@tanstack/react-query'
 
 import { ldapAuth } from '@/api/auth'
 
-import type { AxiosError } from 'axios'
+import type { AxiosResponse } from 'axios'
 import type { AuthResponse, LdapAuthArgs } from '@/api/auth/types'
 import type { UseMutationResult } from '@tanstack/react-query'
 import type { AuthErrorResponse } from '@/types/auth-error-response.type'
 
-export const useLdapAuth = (): UseMutationResult<AuthResponse, AxiosError<AuthErrorResponse>, LdapAuthArgs> =>
+export const useLdapAuth = (): UseMutationResult<AuthResponse, AxiosResponse<AuthErrorResponse>, LdapAuthArgs> =>
   useMutation({
     mutationFn: (data) => ldapAuth(data),
   })