diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9e162ccd..e977a31b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,10 +6,10 @@
 
 ## Introduction
 
-DevFAQ is organised into a monorepo with Turborepo. You'll find frontend ([www](./apps/www)) and backend ([api](./apps/api)) in the [apps](./apps) directory.
+DevFAQ is organised into a monorepo with Turborepo. You'll find frontend ([app](./apps/app)) and backend ([api](./apps/api)) in the [apps](./apps) directory.
 
 - Frontend is written in **Next.js (React) with TypeScript**.
-- Backend is a REST API, and uses **HapiJS, PostgreSQL, and TypeScript**.
+- Backend is a REST API, and uses **Fastify, PostgreSQL, and TypeScript**.
 
 ## Project setup
 
diff --git a/apps/api/modules/questions/questions.routes.ts b/apps/api/modules/questions/questions.routes.ts
index 3642022a..bbe1b774 100644
--- a/apps/api/modules/questions/questions.routes.ts
+++ b/apps/api/modules/questions/questions.routes.ts
@@ -79,7 +79,14 @@ const questionsPlugin: FastifyPluginAsync = async (fastify) => {
 		method: "POST",
 		schema: generatePostQuestionsSchema(args),
 		async handler(request, reply) {
-			const { question, level, category } = request.body;
+			const {
+				body: { question, level, category },
+				session: { data: sessionData },
+			} = request;
+
+			if (!sessionData) {
+				throw fastify.httpErrors.unauthorized();
+			}
 
 			try {
 				const newQuestion = await fastify.db.question.create({
@@ -88,6 +95,7 @@ const questionsPlugin: FastifyPluginAsync = async (fastify) => {
 						levelId: level,
 						categoryId: category,
 						statusId: "pending",
+						createdById: sessionData._user.id,
 					},
 				});
 
diff --git a/apps/api/prisma/migrations/20221220132352_added_created_by_to_question/migration.sql b/apps/api/prisma/migrations/20221220132352_added_created_by_to_question/migration.sql
new file mode 100644
index 00000000..833b4ca4
--- /dev/null
+++ b/apps/api/prisma/migrations/20221220132352_added_created_by_to_question/migration.sql
@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "Question" ADD COLUMN     "_createdById" INTEGER;
+
+-- AddForeignKey
+ALTER TABLE "Question" ADD CONSTRAINT "Question__createdById_fkey" FOREIGN KEY ("_createdById") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/apps/api/prisma/schema.prisma b/apps/api/prisma/schema.prisma
index 6e582bb3..a70b5643 100644
--- a/apps/api/prisma/schema.prisma
+++ b/apps/api/prisma/schema.prisma
@@ -14,11 +14,13 @@ model Question {
   categoryId       String           @map("_categoryId")
   levelId          String           @map("_levelId")
   statusId         String           @default("pending") @map("_statusId")
+  createdById      Int?             @map("_createdById")
   createdAt        DateTime         @default(now()) @db.Timestamptz(6)
   updatedAt        DateTime         @updatedAt() @db.Timestamptz(6)
   QuestionCategory QuestionCategory @relation(fields: [categoryId], references: [id], onDelete: Cascade)
   QuestionLevel    QuestionLevel    @relation(fields: [levelId], references: [id], onDelete: Cascade)
   QuestionStatus   QuestionStatus   @relation(fields: [statusId], references: [id], onDelete: Cascade)
+  CreatedBy        User?            @relation(fields: [createdById], references: [id], onDelete: Cascade)
   QuestionVote     QuestionVote[]
 }
 
@@ -79,6 +81,7 @@ model User {
   UserRole     UserRole       @relation(fields: [roleId], references: [id], onDelete: Cascade)
   QuestionVote QuestionVote[]
   Session      Session[]
+  Question     Question[]
 }
 
 model UserRole {
diff --git a/apps/app/src/components/CtaHeader/AddQuestionButton.tsx b/apps/app/src/components/CtaHeader/AddQuestionButton.tsx
index fa7c70c6..0f6d2c5f 100644
--- a/apps/app/src/components/CtaHeader/AddQuestionButton.tsx
+++ b/apps/app/src/components/CtaHeader/AddQuestionButton.tsx
@@ -1,17 +1,21 @@
 "use client";
 
+import { useDevFAQRouter } from "../../hooks/useDevFAQRouter";
 import { useUIContext } from "../../providers/UIProvider";
 import { Button } from "../Button/Button";
 
 export const AddQuestionButton = () => {
 	const { openModal } = useUIContext();
+	const { requireLoggedIn } = useDevFAQRouter();
+
+	const handleButtonClick = () => openModal("AddQuestionModal");
 
 	return (
 		<>
 			<Button
 				variant="brandingInverse"
 				className="hidden sm:inline-block"
-				onClick={() => openModal("AddQuestionModal")}
+				onClick={requireLoggedIn(handleButtonClick)}
 			>
 				Dodaj pytanie
 			</Button>