diff --git a/public/images/cursor.svg b/public/images/cursor.svg
new file mode 100644
index 00000000..1f8a7c33
--- /dev/null
+++ b/public/images/cursor.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Ebene_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 466.73 533.32">
+  <!-- Generator: Adobe Illustrator 29.6.1, SVG Export Plug-In . SVG Version: 2.1.1 Build 9)  -->
+  <defs>
+    <style>
+      .st0 {
+        fill: #72716d;
+      }
+
+      .st1 {
+        fill: #55544f;
+      }
+
+      .st2 {
+        fill: #fff;
+      }
+
+      .st3 {
+        fill: #43413c;
+      }
+
+      .st4 {
+        fill: #d6d5d2;
+      }
+    </style>
+  </defs>
+  <path class="st0" d="M233.37,266.66l231.16,133.46c-1.42,2.46-3.48,4.56-6.03,6.03l-216.06,124.74c-5.61,3.24-12.53,3.24-18.14,0L8.24,406.15c-2.55-1.47-4.61-3.57-6.03-6.03l231.16-133.46h0Z"/>
+  <path class="st1" d="M233.37,0v266.66L2.21,400.12c-1.42-2.46-2.21-5.3-2.21-8.24v-250.44c0-5.89,3.14-11.32,8.24-14.27L224.29,2.43c2.81-1.62,5.94-2.43,9.07-2.43h.01Z"/>
+  <path class="st3" d="M464.52,133.2c-1.42-2.46-3.48-4.56-6.03-6.03L242.43,2.43c-2.8-1.62-5.93-2.43-9.06-2.43v266.66l231.16,133.46c1.42-2.46,2.21-5.3,2.21-8.24v-250.44c0-2.95-.78-5.77-2.21-8.24h-.01Z"/>
+  <path class="st4" d="M448.35,142.54c1.31,2.26,1.49,5.16,0,7.74l-209.83,363.42c-1.41,2.46-5.16,1.45-5.16-1.38v-239.48c0-1.91-.51-3.75-1.44-5.36l216.42-124.95h.01Z"/>
+  <path class="st2" d="M448.35,142.54l-216.42,124.95c-.92-1.6-2.26-2.96-3.92-3.92L20.62,143.83c-2.46-1.41-1.45-5.16,1.38-5.16h419.65c2.98,0,5.4,1.61,6.7,3.87Z"/>
+</svg>
\ No newline at end of file
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 62e8f1c5..7666fea9 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -47,6 +47,7 @@
     "neovim": "Download Testaustime for Neovim",
     "title": "Extensions",
     "vscode": "Download Testaustime for Visual Studio Code",
+    "cursor": "Download Testaustime for Cursor",
     "sublime": "Download Testaustime for Sublime Text"
   },
   "footer": {
@@ -308,7 +309,9 @@
     }
   },
   "authorize": {
-    "body": "You are logging in to the official Visual Studio Code extension.",
+    "body": "You are logging in to the official {{editor}} extension.",
+    "invalidEditor": "This editor is invalid.",
+    "unsupportedEditor": "This editor is not supported.",
     "continue": "Continue as {{username}}",
     "notWorking": {
       "text": "Not working?",
diff --git a/public/locales/fi/common.json b/public/locales/fi/common.json
index 759908dd..5d07b743 100644
--- a/public/locales/fi/common.json
+++ b/public/locales/fi/common.json
@@ -42,6 +42,7 @@
   },
   "extensions": {
     "body": "Lataa Testaustime-laajennus suosikkieditorillesi!",
+    "cursor": "Lataa Testaustime Cursor:lle",
     "intellij": "Lataa Testaustime IntelliJ:lle",
     "micro": "Lataa Testaustime Micro:lle",
     "neovim": "Lataa Testaustime Neovim:lle",
@@ -308,7 +309,9 @@
     }
   },
   "authorize": {
-    "body": "Olet kirjautumassa sisään viralliseen Visual Studio Code -lisäosaan.",
+    "body": "Olet kirjautumassa sisään viralliseen {{editor}} -lisäosaan.",
+    "invalidEditor": "Tämä editori on virheellinen.",
+    "unsupportedEditor": "Tätä editoria ei tueta.",
     "continue": "Jatka käyttäjänä {{username}}",
     "notWorking": {
       "text": "Eikö toimi?",
diff --git a/src/app/[locale]/authorize/page.tsx b/src/app/[locale]/authorize/page.tsx
index b12adf9a..9b4d73e1 100644
--- a/src/app/[locale]/authorize/page.tsx
+++ b/src/app/[locale]/authorize/page.tsx
@@ -15,16 +15,36 @@ export default async function AuthorizePage({
 }) {
   const { t } = await initTranslations(locale, ["common"]);
 
-  const loginUrl =
-    editor == "vscode"
-      ? `/login?redirect=${encodeURIComponent("/authorize?editor=vscode")}`
-      : "/login";
+  const loginUrls = new Map(
+    Object.entries({
+      vscode: `/login?redirect=${encodeURIComponent("/authorize?editor=vscode")}`,
+      cursor: `/login?redirect=${encodeURIComponent("/authorize?editor=cursor")}`,
+    }),
+  );
+  const loginUrl = loginUrls.get(editor ?? "vscode");
+
+  if (loginUrl === undefined) {
+    // Make this prettier
+    return <div>{t("authorize.unsupportedEditor")}</div>;
+  }
 
   const token = cookies().get("token")?.value;
   if (!token) {
     redirect(loginUrl);
   }
 
+  const redirectUrls = new Map(
+    Object.entries({
+      vscode: `vscode://testausserveri-ry.testaustime/authorize?token=${token}`,
+      cursor: `cursor://testausserveri-ry.testaustime-cursor/authorize?token=${token}`,
+    }),
+  );
+  const redirectUrl = redirectUrls.get(editor ?? "vscode");
+  if (redirectUrl === undefined) {
+    // Make this prettier
+    return <div>{t("authorize.unsupportedEditor")}</div>;
+  }
+
   const me = await getMe();
   if (!me || "error" in me) {
     redirect(loginUrl);
@@ -32,6 +52,18 @@ export default async function AuthorizePage({
 
   const { username } = me;
 
+  const editorNames = new Map(
+    Object.entries({
+      vscode: "Visual Studio Code",
+      cursor: "Cursor",
+    }),
+  );
+  const editorName = editorNames.get(editor ?? "vscode");
+
+  if (editorName === undefined) {
+    return <div>{t("authorize.invalidEditor")}</div>;
+  }
+
   return (
     <Stack align="center" gap="xl">
       <Image
@@ -40,10 +72,10 @@ export default async function AuthorizePage({
         width={40}
         height={40}
       />
-      <Text>{t("authorize.body")}</Text>
+      <Text>{t("authorize.body", { editor: editorName })}</Text>
       <Button
         component="a"
-        href={`vscode://testausserveri-ry.testaustime/authorize?token=${token}`}
+        href={redirectUrl}
       >
         {t("authorize.continue", { username })}
       </Button>
diff --git a/src/app/[locale]/extensions/page.tsx b/src/app/[locale]/extensions/page.tsx
index 54451708..343058da 100644
--- a/src/app/[locale]/extensions/page.tsx
+++ b/src/app/[locale]/extensions/page.tsx
@@ -77,6 +77,13 @@ export default async function ExtensionsPage({
             sourceCodeLink="https://github.com/Testausserveri/testaustime-vscode"
             text={t("extensions.vscode")}
           />
+          <ExtensionBlock
+            logo="/images/cursor.svg"
+            alt="Cursor logo"
+            downloadLink="https://marketplace.visualstudio.com/items?itemName=testausserveri-ry.testaustime-cursor"
+            sourceCodeLink="https://github.com/Testausserveri/testaustime-cursor"
+            text={t("extensions.cursor")}
+          />
           <ExtensionBlock
             logo="/images/neovim.svg"
             alt="Neovim logo"
diff --git a/src/components/LoginForm/actions.ts b/src/components/LoginForm/actions.ts
index 80219b96..6a5fbfd5 100644
--- a/src/components/LoginForm/actions.ts
+++ b/src/components/LoginForm/actions.ts
@@ -22,6 +22,7 @@ const allowedRedirects = [
   "/friends",
   "/leaderboards",
   "/authorize?editor=vscode",
+  "/authorize?editor=cursor",
 ];
 
 export const logIn = async (