diff --git a/components/avatar-user.tsx b/components/avatar-user.tsx
index 7ba1038..f715517 100644
--- a/components/avatar-user.tsx
+++ b/components/avatar-user.tsx
@@ -50,8 +50,8 @@ export function AvatarUser() {
       <SheetTrigger asChild>
         <div className="relative">
           {data && data.exists && data.data.premium && (
-            <div className="absolute z-10 rounded-full -bottom-1 -right-1 flex items-center justify-center border-2 border-yellow-500 bg-white dark:bg-slate-800">
-              <Verified className="shrink-0 h-5 w-5 text-yellow-500 p-1" />
+            <div className="absolute -bottom-1 -right-1 z-10 flex items-center justify-center rounded-full border-2 border-yellow-500 bg-white dark:bg-slate-800">
+              <Verified className="h-5 w-5 shrink-0 p-1 text-yellow-500" />
             </div>
           )}
           <Avatar
diff --git a/components/form/publish.tsx b/components/form/publish.tsx
index 399db96..d0ec908 100644
--- a/components/form/publish.tsx
+++ b/components/form/publish.tsx
@@ -160,20 +160,26 @@ export default function PublishForms({ dataForm }: { dataForm: any }) {
           <Eye className="mr-2 h-4 w-4" />
           View form
         </Link>
-        <h3 className="text-md mt-4 font-semibold">
-          {dataForm.published
-            ? "Your form is currently online and can be viewed and answered by anyone at the link"
-            : "Your form is not published so can only be seen by you alone"}
-        </h3>
-        {isLoadingUpdateForm ? (
-          <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-        ) : (
-          <p
-            className="mb-4 mt-2 cursor-pointer text-sm font-semibold uppercase text-muted-foreground underline underline-offset-4"
-            onClick={() => changeStatutOfForm()}
-          >
-            {!dataForm?.published ? "Publish" : "Unpublish"} your form
-          </p>
+        {dataForm.idAuthor === userPseudo && (
+          <>
+            <h3 className="text-md mt-4 font-semibold">
+              {dataForm.published
+                ? "Your form is currently online and can be viewed and answered by anyone at the link"
+                : "Your form is not published so can only be seen by you alone"}
+            </h3>
+            <>
+              {isLoadingUpdateForm ? (
+                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+              ) : (
+                <p
+                  className="mb-4 mt-2 cursor-pointer text-sm font-semibold uppercase text-muted-foreground underline underline-offset-4"
+                  onClick={() => changeStatutOfForm()}
+                >
+                  {!dataForm?.published ? "Publish" : "Unpublish"} your form
+                </p>
+              )}
+            </>
+          </>
         )}
         {isSuccessUpdateForm && (
           <div
diff --git a/components/form/questions.tsx b/components/form/questions.tsx
index 7eb404f..f340f97 100644
--- a/components/form/questions.tsx
+++ b/components/form/questions.tsx
@@ -121,6 +121,7 @@ export default function QuestionsForms({ dataForm }: { dataForm: any }) {
     updateFormDocument,
     isLoading: isLoadingUpdateForm,
     isError: isErrorUpdateForm,
+    error: errorUpdateForm,
     isSuccess: isSuccessUpdateForm,
     reset: resetUpdateForm,
   }: any = useUpdateFormDocument("forms")
@@ -213,79 +214,85 @@ export default function QuestionsForms({ dataForm }: { dataForm: any }) {
 
   return (
     <div className="flex w-full flex-col items-start gap-4 sm:flex-row">
-      <div className="flex w-full shrink-0 flex-col items-start gap-2 rounded-md sm:sticky sm:top-20 sm:w-[250px]">
-        <button
-          onClick={() => handleAddField("heading")}
-          className="flex w-full items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800"
-        >
-          <Heading className="h-5 w-5" />
-          <span className="ml-2 text-sm font-semibold">Heading</span>
-        </button>
-        <button
-          onClick={() => handleAddField("text")}
-          className="flex w-full items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800"
-        >
-          <Minus className="h-5 w-5" />
-          <span className="ml-2 text-sm font-semibold">Short answer</span>
-        </button>
-        <button
-          onClick={() => handleAddField("longtext")}
-          className="flex w-full items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800"
-        >
-          <AlignJustify className="h-5 w-5" />
-          <span className="ml-2 text-sm font-semibold">Long answer</span>
-        </button>
-        <button
-          //onClick={() => handleAddField("link")}
-          className="flex w-full items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800"
-        >
-          <LinkIcon className="h-5 w-5" />
-          <span className="ml-2 text-sm font-semibold">Link</span>
-          <span className="mr-2 rounded-full bg-yellow-100 px-2.5 py-0.5 text-xs font-medium text-yellow-800 dark:bg-yellow-900 dark:text-yellow-300">
-            soon
-          </span>
-        </button>
-        <button
-          //onClick={() => handleAddField("email")}
-          className="flex w-full items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800"
-        >
-          <Mail className="h-5 w-5" />
-          <span className="ml-2 text-sm font-semibold">E-mail</span>
-          <span className="mr-2 rounded-full bg-yellow-100 px-2.5 py-0.5 text-xs font-medium text-yellow-800 dark:bg-yellow-900 dark:text-yellow-300">
-            soon
-          </span>
-        </button>
-        <button className="flex w-full cursor-default items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800">
-          <CircleDot className="h-5 w-5" />
-          <span className="ml-2 text-sm font-semibold">Unique choice</span>
-          <span className="mr-2 rounded-full bg-yellow-100 px-2.5 py-0.5 text-xs font-medium text-yellow-800 dark:bg-yellow-900 dark:text-yellow-300">
-            soon
-          </span>
-        </button>
-        <button className="flex w-full cursor-default items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800">
-          <ListChecks className="h-5 w-5" />
-          <span className="ml-2 text-sm font-semibold">Multi choice</span>
-          <span className="mr-2 rounded-full bg-yellow-100 px-2.5 py-0.5 text-xs font-medium text-yellow-800 dark:bg-yellow-900 dark:text-yellow-300">
-            soon
-          </span>
-        </button>
-        <button className="flex w-full cursor-default items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800">
-          <List className="h-5 w-5" />
-          <span className="ml-2 text-sm font-semibold">List of choices</span>
-          <span className="mr-2 rounded-full bg-yellow-100 px-2.5 py-0.5 text-xs font-medium text-yellow-800 dark:bg-yellow-900 dark:text-yellow-300">
-            soon
-          </span>
-        </button>
-        <button className="flex w-full cursor-default items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800">
-          <Calendar className="h-5 w-5" />
-          <span className="ml-2 text-sm font-semibold">Date</span>
-          <span className="mr-2 rounded-full bg-yellow-100 px-2.5 py-0.5 text-xs font-medium text-yellow-800 dark:bg-yellow-900 dark:text-yellow-300">
-            soon
-          </span>
-        </button>
-        <Separator className="my-2 hidden w-full sm:block" />
-      </div>
-      <Separator className="my-2 block w-full sm:hidden" />
+      {dataForm.idAuthor === userPseudo && (
+        <>
+          <div className="flex w-full shrink-0 flex-col items-start gap-2 rounded-md sm:sticky sm:top-20 sm:w-[250px]">
+            <button
+              onClick={() => handleAddField("heading")}
+              className="flex w-full items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800"
+            >
+              <Heading className="h-5 w-5" />
+              <span className="ml-2 text-sm font-semibold">Heading</span>
+            </button>
+            <button
+              onClick={() => handleAddField("text")}
+              className="flex w-full items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800"
+            >
+              <Minus className="h-5 w-5" />
+              <span className="ml-2 text-sm font-semibold">Short answer</span>
+            </button>
+            <button
+              onClick={() => handleAddField("longtext")}
+              className="flex w-full items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800"
+            >
+              <AlignJustify className="h-5 w-5" />
+              <span className="ml-2 text-sm font-semibold">Long answer</span>
+            </button>
+            <button
+              //onClick={() => handleAddField("link")}
+              className="flex w-full items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800"
+            >
+              <LinkIcon className="h-5 w-5" />
+              <span className="ml-2 text-sm font-semibold">Link</span>
+              <span className="mr-2 rounded-full bg-yellow-100 px-2.5 py-0.5 text-xs font-medium text-yellow-800 dark:bg-yellow-900 dark:text-yellow-300">
+                soon
+              </span>
+            </button>
+            <button
+              //onClick={() => handleAddField("email")}
+              className="flex w-full items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800"
+            >
+              <Mail className="h-5 w-5" />
+              <span className="ml-2 text-sm font-semibold">E-mail</span>
+              <span className="mr-2 rounded-full bg-yellow-100 px-2.5 py-0.5 text-xs font-medium text-yellow-800 dark:bg-yellow-900 dark:text-yellow-300">
+                soon
+              </span>
+            </button>
+            <button className="flex w-full cursor-default items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800">
+              <CircleDot className="h-5 w-5" />
+              <span className="ml-2 text-sm font-semibold">Unique choice</span>
+              <span className="mr-2 rounded-full bg-yellow-100 px-2.5 py-0.5 text-xs font-medium text-yellow-800 dark:bg-yellow-900 dark:text-yellow-300">
+                soon
+              </span>
+            </button>
+            <button className="flex w-full cursor-default items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800">
+              <ListChecks className="h-5 w-5" />
+              <span className="ml-2 text-sm font-semibold">Multi choice</span>
+              <span className="mr-2 rounded-full bg-yellow-100 px-2.5 py-0.5 text-xs font-medium text-yellow-800 dark:bg-yellow-900 dark:text-yellow-300">
+                soon
+              </span>
+            </button>
+            <button className="flex w-full cursor-default items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800">
+              <List className="h-5 w-5" />
+              <span className="ml-2 text-sm font-semibold">
+                List of choices
+              </span>
+              <span className="mr-2 rounded-full bg-yellow-100 px-2.5 py-0.5 text-xs font-medium text-yellow-800 dark:bg-yellow-900 dark:text-yellow-300">
+                soon
+              </span>
+            </button>
+            <button className="flex w-full cursor-default items-center justify-start gap-1 rounded-md px-4 py-2 hover:bg-slate-100 hover:dark:bg-slate-800">
+              <Calendar className="h-5 w-5" />
+              <span className="ml-2 text-sm font-semibold">Date</span>
+              <span className="mr-2 rounded-full bg-yellow-100 px-2.5 py-0.5 text-xs font-medium text-yellow-800 dark:bg-yellow-900 dark:text-yellow-300">
+                soon
+              </span>
+            </button>
+            <Separator className="my-2 hidden w-full sm:block" />
+          </div>
+          <Separator className="my-2 block w-full sm:hidden" />
+        </>
+      )}
       <div
         id="questions"
         className="relative flex w-full flex-col items-start gap-4 overflow-hidden rounded-md border px-4 pb-4 pt-7"
@@ -350,13 +357,15 @@ export default function QuestionsForms({ dataForm }: { dataForm: any }) {
                 {/* {errors?.questions?.[index]?.text && (
                 <p>{errors.questions[index].text.message}</p>
               )} */}
-                <Button
-                  variant="destructive"
-                  className="absolute -top-2 right-2 flex h-10 w-10 items-center justify-center rounded-full p-2"
-                  onClick={() => handleRemoveField(index)}
-                >
-                  <Trash className="h-4 w-4" />
-                </Button>
+                {dataForm.idAuthor === userPseudo && (
+                  <Button
+                    variant="destructive"
+                    className="absolute -top-2 right-2 flex h-10 w-10 items-center justify-center rounded-full p-2"
+                    onClick={() => handleRemoveField(index)}
+                  >
+                    <Trash className="h-4 w-4" />
+                  </Button>
+                )}
               </div>
             )
           })}
@@ -390,18 +399,20 @@ export default function QuestionsForms({ dataForm }: { dataForm: any }) {
             </button>
           </div>
         )}
-        <Button
-          variant="outline"
-          disabled={isLoadingUpdateForm}
-          onClick={isLoadingUpdateForm ? undefined : handleSubmit(onSubmit)}
-        >
-          {isLoadingUpdateForm ? (
-            <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-          ) : (
-            <Save className="mr-2 h-4 w-4" />
-          )}
-          Save questions
-        </Button>
+        {dataForm.idAuthor === userPseudo && (
+          <Button
+            variant="outline"
+            disabled={isLoadingUpdateForm}
+            onClick={isLoadingUpdateForm ? undefined : handleSubmit(onSubmit)}
+          >
+            {isLoadingUpdateForm ? (
+              <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+            ) : (
+              <Save className="mr-2 h-4 w-4" />
+            )}
+            Save questions
+          </Button>
+        )}
       </div>
     </div>
   )
diff --git a/components/form/settings.tsx b/components/form/settings.tsx
index c144d35..46e6ee3 100644
--- a/components/form/settings.tsx
+++ b/components/form/settings.tsx
@@ -394,11 +394,11 @@ export default function SettingsForms({ dataForm }: { dataForm: any }) {
           <div className="flex w-full flex-col items-start gap-1">
             <Label className="text-left">Add people to manage this form.</Label>
             <p className="text-left text-sm">
-              The people you have added will be able to modify and view the
-              answers to this form.
+              The added persons will be able to consult the answers to your
+              form.
             </p>
           </div>
-          <div className="w-full flex items-center gap-2 mb-2">
+          <div className="mb-2 flex w-full items-center gap-2">
             <Input
               placeholder="Enter username"
               onChange={(e) => {
@@ -425,22 +425,22 @@ export default function SettingsForms({ dataForm }: { dataForm: any }) {
             </Button>
           </div>
           {dataForm.collaborators.length !== 0 && (
-            <div className="w-full flex flex-col gap-2">
+            <div className="flex w-full flex-col gap-2">
               {dataForm.collaborators.map((collaborator, index) => (
                 <div
                   key={collaborator.pseudo}
-                  className="w-full flex items-center bg-slate-50 dark:bg-slate-800 py-3 px-5 rounded-md"
+                  className="flex w-full items-center rounded-md bg-slate-50 px-5 py-3 dark:bg-slate-800"
                 >
-                  <div className="w-full flex">
+                  <div className="flex w-full">
                     <a
                       href={`/user/${collaborator.pseudo}`}
-                      className="text-sm font-semibold underline underline-offset-4 cursor-pointer"
+                      className="cursor-pointer text-sm font-semibold underline underline-offset-4"
                     >
                       {collaborator.pseudo}
                     </a>
                   </div>
                   <span
-                    className="shrink-0 block text-sm text-red-600 font-medium underline underline-offset-4 cursor-pointer"
+                    className="block shrink-0 cursor-pointer text-sm font-medium text-red-600 underline underline-offset-4"
                     onClick={() => {
                       isLoadingUpdateForm
                         ? undefined
@@ -534,8 +534,8 @@ export default function SettingsForms({ dataForm }: { dataForm: any }) {
           </Label>
         </div> */}
 
-        <div className="sticky inset-x-0 bottom-0 flex w-full border-t flex-col items-start gap-2 bg-white py-4 dark:bg-slate-900">
-          <div className="w-full flex items-center justify-between">
+        <div className="sticky inset-x-0 bottom-0 flex w-full flex-col items-start gap-2 border-t bg-white py-4 dark:bg-slate-900">
+          <div className="flex w-full items-center justify-between">
             <Button
               variant="default"
               disabled={isLoadingUpdateForm || checkIfUsernameExist}
@@ -562,7 +562,7 @@ export default function SettingsForms({ dataForm }: { dataForm: any }) {
                   </AlertDialogTitle>
                   <AlertDialogDescription className="space-y-3">
                     <div
-                      className="rounded-lg bg-red-50 p-4 text-sm text-red-800 dark:bg-gray-800 dark:text-red-400 font-semibold"
+                      className="rounded-lg bg-red-50 p-4 text-sm font-semibold text-red-800 dark:bg-gray-800 dark:text-red-400"
                       role="alert"
                     >
                       This action is irreversible, please reflect beforehand.
diff --git a/firebase/firestore/checkIfIDExistOnCollection.js b/firebase/firestore/checkIfIDExistOnCollection.js
index e17c515..b453ffe 100644
--- a/firebase/firestore/checkIfIDExistOnCollection.js
+++ b/firebase/firestore/checkIfIDExistOnCollection.js
@@ -14,3 +14,4 @@ export async function checkIdAvailability(collectionName, id) {
       return false;
     }
   }
+
diff --git a/firebase/firestore/updateFormDocument.js b/firebase/firestore/updateFormDocument.js
index 5362ccb..067d267 100644
--- a/firebase/firestore/updateFormDocument.js
+++ b/firebase/firestore/updateFormDocument.js
@@ -48,6 +48,7 @@ const useUpdateFormDocument = (collectionName) => {
     updateFormDocument: mutation.mutate,
     isLoading: mutation.isLoading,
     isError: mutation.isError,
+    error: mutation.error,
     isSuccess: mutation.isSuccess,
     reset: mutation.reset,
   }
diff --git a/pages/form/[form]/index.tsx b/pages/form/[form]/index.tsx
index eb4254e..d9a44df 100644
--- a/pages/form/[form]/index.tsx
+++ b/pages/form/[form]/index.tsx
@@ -156,7 +156,10 @@ export default function FormPage() {
         )}
         {dataForm &&
           dataForm.exists &&
-          dataForm.data.idAuthor === userPseudo && (
+          (dataForm.data.idAuthor === userPseudo ||
+            dataForm.data.collaborators.some(
+              (item) => item.pseudo === userPseudo
+            )) && (
             <div className="flex w-full flex-col gap-4">
               <div className="flex w-full flex-col items-start justify-between gap-4 md:flex-row">
                 <div className="flex flex-col items-start gap-2">
@@ -167,23 +170,37 @@ export default function FormPage() {
                     {dataForm.data.description}
                   </p>
                 </div>
-                <div className="md:mtb-0 mb-3">
-                  <Select onValueChange={(value) => goToForm(value)}>
-                    <SelectTrigger className="w-[240px]">
-                      <SelectValue placeholder="Select a form" />
-                    </SelectTrigger>
-                    <SelectContent>
-                      <SelectGroup>
-                        <SelectLabel>Your Forms</SelectLabel>
-                        {dataForms.map((form) => (
-                          <SelectItem key={form.id} value={form.id}>
-                            {form.name}
-                          </SelectItem>
-                        ))}
-                      </SelectGroup>
-                    </SelectContent>
-                  </Select>
-                </div>
+                {dataForm.data.idAuthor === userPseudo ? (
+                  <div className="md:mtb-0 mb-3">
+                    <Select onValueChange={(value) => goToForm(value)}>
+                      <SelectTrigger className="w-[240px]">
+                        <SelectValue placeholder="Select a form" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        <SelectGroup>
+                          <SelectLabel>Your Forms</SelectLabel>
+                          {dataForms.map((form) => (
+                            <SelectItem key={form.id} value={form.id}>
+                              {form.name}
+                            </SelectItem>
+                          ))}
+                        </SelectGroup>
+                      </SelectContent>
+                    </Select>
+                  </div>
+                ) : (
+                  <div className="">
+                    <span className="italic">
+                      Created by{" "}
+                      <a
+                        className="font-bold underline underline-offset-2"
+                        href={`/user/${dataForm.data.idAuthor}`}
+                      >
+                        @ {dataForm.data.idAuthor}
+                      </a>
+                    </span>
+                  </div>
+                )}
               </div>
               <Tabs defaultValue="questions" className="w-full">
                 <TabsList>
@@ -203,10 +220,12 @@ export default function FormPage() {
                       <Send className="mr-2 h-4 w-4" />
                       Publish
                     </TabsTrigger>
-                    <TabsTrigger value="settings">
-                      <Settings2 className="mr-2 h-4 w-4" />
-                      Settings
-                    </TabsTrigger>
+                    {dataForm.data.idAuthor === userPseudo && (
+                      <TabsTrigger value="settings">
+                        <Settings2 className="mr-2 h-4 w-4" />
+                        Settings
+                      </TabsTrigger>
+                    )}
                   </div>
                 </TabsList>
                 <TabsContent className="border-none p-0 pt-4" value="questions">
@@ -254,28 +273,36 @@ export default function FormPage() {
                     </Masonry>
                   </ResponsiveMasonry>
                 </TabsContent>
-                <TabsContent className="border-none p-0 pt-2" value="settings">
-                  <ResponsiveMasonry
-                    columnsCountBreakPoints={{
-                      659: 1,
-                      660: 1,
-                      720: 1,
-                      1200: 1,
-                    }}
-                    className="w-full"
+                {dataForm.data.idAuthor === userPseudo && (
+                  <TabsContent
+                    className="border-none p-0 pt-2"
+                    value="settings"
                   >
-                    <Masonry gutter="1rem">
-                      <SettingsForms dataForm={dataForm.data} />
-                    </Masonry>
-                  </ResponsiveMasonry>
-                </TabsContent>
+                    <ResponsiveMasonry
+                      columnsCountBreakPoints={{
+                        659: 1,
+                        660: 1,
+                        720: 1,
+                        1200: 1,
+                      }}
+                      className="w-full"
+                    >
+                      <Masonry gutter="1rem">
+                        <SettingsForms dataForm={dataForm.data} />
+                      </Masonry>
+                    </ResponsiveMasonry>
+                  </TabsContent>
+                )}
               </Tabs>
             </div>
           )}
         {((dataForm && !dataForm.exists) ||
           (dataForm &&
             dataForm.exists &&
-            dataForm.data.idAuthor !== userPseudo)) && (
+            dataForm.data.idAuthor !== userPseudo &&
+            dataForm.data.collaborators.some(
+              (item) => item.pseudo !== userPseudo
+            ))) && (
           <div className="flex flex-col items-center gap-4">
             <h1 className="text-2xl font-bold">This form does not exist.</h1>
             <Link
diff --git a/pages/index.tsx b/pages/index.tsx
index 2d60a58..02f29da 100755
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -257,7 +257,7 @@ export default function IndexPage() {
           <a
             target="href"
             href="https://www.buymeacoffee.com/lndev/membership"
-            className="text-sky-400 text-center font-semibold underline underline-offset-4 uppercase text-xs"
+            className="text-center text-xs font-semibold uppercase text-sky-400 underline underline-offset-4"
           >
             Your logo here?
           </a>