diff --git a/src/app/[slug]/submit/page.tsx b/src/app/[slug]/submit/page.tsx
index dbf59c4..85585b1 100644
--- a/src/app/[slug]/submit/page.tsx
+++ b/src/app/[slug]/submit/page.tsx
@@ -31,7 +31,14 @@ const page = async ({ params }: PageProps) => {
         Penja apunts {subjectNameArticle}
         {subject.name}
       </h1>
-      <ProfileForm PreselectedSubject={slug} isAdmin={isAdmin} />
+      <ProfileForm
+        PreselectedSubject={slug}
+        isAdmin={isAdmin}
+        session={session}
+        semester={
+          subject.semester[0] === "Q" ? parseInt(subject.semester[1]) : 8
+        }
+      />
     </>
   )
 }
diff --git a/src/app/api/subject/post/create/route.ts b/src/app/api/subject/post/create/route.ts
index fffec0b..ab5350d 100644
--- a/src/app/api/subject/post/create/route.ts
+++ b/src/app/api/subject/post/create/route.ts
@@ -14,7 +14,7 @@ export async function POST(req: Request) {
 
     const body = await req.json()
 
-    const { pdf, title, assignatura, tipus, anonim, authorEmail } =
+    const { pdf, title, year, assignatura, tipus, anonim, authorEmail } =
       ApuntsPostValidator.parse(body)
 
     const subject = await db.subject.findFirst({
@@ -27,14 +27,6 @@ export async function POST(req: Request) {
       return new Response("Subject not found", { status: 404 })
     }
 
-    const semester = subject.semester
-    const semesterNumber = semester[0] === "Q" ? parseInt(semester[1]) : 8
-    if (typeof session.user.generacio !== "number") {
-      return new Response("Invalid generacio", { status: 409 })
-    }
-    const year: number =
-      session.user.generacio + Math.floor((semesterNumber - 1) / 2)
-
     if (
       !["apunts", "examens", "exercicis", "diapositives", "altres"].includes(
         tipus,
diff --git a/src/components/Form.tsx b/src/components/Form.tsx
index d6c89de..91546ab 100644
--- a/src/components/Form.tsx
+++ b/src/components/Form.tsx
@@ -22,12 +22,16 @@ import { Combobox } from "@/components/Combobox"
 import { Checkbox } from "@/components/ui/checkbox"
 import { ApuntsPostCreationRequest } from "@/lib/validators/post"
 import { uploadFiles } from "@/lib/uploadthing"
+import { Session } from "next-auth"
 
 const formSchema = z.object({
   pdf: z.any(),
   title: z.string({
     required_error: "Selecciona un títol",
   }),
+  year: z.string({
+    required_error: "Selecciona un any",
+  }),
   assignatura: z.string({
     required_error: "Selecciona una assignatura.",
   }),
@@ -43,9 +47,13 @@ const formSchema = z.object({
 export function ProfileForm({
   PreselectedSubject,
   isAdmin,
+  session,
+  semester,
 }: {
   PreselectedSubject: string
   isAdmin: boolean
+  session: Session
+  semester: number
 }) {
   const router = useRouter()
 
@@ -53,6 +61,7 @@ export function ProfileForm({
     mutationFn: async ({
       pdf,
       title,
+      year,
       assignatura,
       tipus,
       anonim,
@@ -61,6 +70,7 @@ export function ProfileForm({
       const payload: ApuntsPostCreationRequest = {
         pdf,
         title,
+        year,
         assignatura,
         tipus,
         anonim,
@@ -115,6 +125,7 @@ export function ProfileForm({
     const payload: ApuntsPostCreationRequest = {
       pdf: res.fileUrl,
       title: data.title,
+      year: Number(data.year),
       assignatura: data.assignatura,
       tipus: data.tipus,
       anonim: data.anonim,
@@ -264,6 +275,21 @@ export function ProfileForm({
       label: "Altres",
     },
   ]
+
+  const date = new Date()
+  const end = date.getFullYear()
+  const begin = session ? Number(session.user.generacio) : 2017 // primera promoció
+  let tipus_any = []
+  for (let i = begin; i <= end; i++) {
+    tipus_any.push({
+      value: i.toString(),
+      label: i.toString(),
+    })
+  }
+  const default_year = session
+    ? session.user.generacio + Math.floor((semester - 1) / 2)
+    : end
+
   // ------------------------------
   return (
     <Form {...form}>
@@ -271,6 +297,31 @@ export function ProfileForm({
         onSubmit={form.handleSubmit(onSubmit as SubmitHandler<FieldValues>)}
         className="space-y-8"
       >
+        <FormField
+          control={form.control}
+          name="year"
+          render={({ field }) => {
+            if (!field.value) {
+              field.value = default_year.toString()
+            }
+
+            return (
+              <FormItem>
+                <FormLabel>Any</FormLabel>
+                <FormControl>
+                  <Combobox
+                    options={tipus_any}
+                    value={field.value}
+                    setValue={field.onChange}
+                  />
+                </FormControl>
+                <FormDescription>
+                  Any que has cursat l&apos;assignatura.
+                </FormDescription>
+              </FormItem>
+            )
+          }}
+        />
         <FormField
           control={form.control}
           name="pdf"
diff --git a/src/lib/validators/post.ts b/src/lib/validators/post.ts
index 610d1dc..be2fdce 100644
--- a/src/lib/validators/post.ts
+++ b/src/lib/validators/post.ts
@@ -19,6 +19,7 @@ export const CommentValidator = z.object({
 export const ApuntsPostValidator = z.object({
   pdf: z.any(),
   title: z.string(),
+  year: z.number(),
   assignatura: z.string().min(2).max(5),
   tipus: z.string(),
   anonim: z.boolean(),