diff --git a/ui/components/auth/oss/auth-form.tsx b/ui/components/auth/oss/auth-form.tsx
index af731fa60c..e215abad4f 100644
--- a/ui/components/auth/oss/auth-form.tsx
+++ b/ui/components/auth/oss/auth-form.tsx
@@ -210,6 +210,7 @@ export const AuthForm = ({
                       defaultValue={invitationToken}
                       isRequired={false}
                       isInvalid={!!form.formState.errors.invitationToken}
+                      isDisabled={invitationToken !== null && true}
                     />
                   )}
                 </>
diff --git a/ui/components/invitations/invitation-details.tsx b/ui/components/invitations/invitation-details.tsx
index 117928e4cc..3cd2224b59 100644
--- a/ui/components/invitations/invitation-details.tsx
+++ b/ui/components/invitations/invitation-details.tsx
@@ -32,7 +32,7 @@ export const InvitationDetails = ({ attributes }: InvitationDetailsProps) => {
       ? window.location.origin
       : "http://localhost:3000";
 
-  const invitationLink = `${baseUrl}/invitations/check-details?id=${attributes.token}`;
+  const invitationLink = `${baseUrl}/sign-up?invitation_token=${attributes.token}`;
 
   return (
     <div className="flex flex-col gap-x-4 gap-y-8">
diff --git a/ui/components/ui/custom/custom-input.tsx b/ui/components/ui/custom/custom-input.tsx
index 2b390b83c0..16f65367d8 100644
--- a/ui/components/ui/custom/custom-input.tsx
+++ b/ui/components/ui/custom/custom-input.tsx
@@ -21,6 +21,7 @@ interface CustomInputProps<T extends FieldValues> {
   defaultValue?: string;
   isRequired?: boolean;
   isInvalid?: boolean;
+  isDisabled?: boolean;
 }
 
 export const CustomInput = <T extends FieldValues>({
@@ -37,6 +38,7 @@ export const CustomInput = <T extends FieldValues>({
   defaultValue,
   isRequired = true,
   isInvalid,
+  isDisabled = false,
 }: CustomInputProps<T>) => {
   const [isPasswordVisible, setIsPasswordVisible] = useState(false);
   const [isConfirmPasswordVisible, setIsConfirmPasswordVisible] =
@@ -103,6 +105,7 @@ export const CustomInput = <T extends FieldValues>({
               isInvalid={isInvalid}
               defaultValue={defaultValue}
               endContent={endContent}
+              isDisabled={isDisabled}
               {...field}
             />
           </FormControl>