diff --git a/test/api/v3/integration/unsubscription/POST-paymentId-subscribe-cancel.test.js b/test/api/v3/integration/emails/GET-email-unsubscribe.test.js
similarity index 78%
rename from test/api/v3/integration/unsubscription/POST-paymentId-subscribe-cancel.test.js
rename to test/api/v3/integration/emails/GET-email-unsubscribe.test.js
index 359c0061df..bd13cbdc1e 100644
--- a/test/api/v3/integration/unsubscription/POST-paymentId-subscribe-cancel.test.js
+++ b/test/api/v3/integration/emails/GET-email-unsubscribe.test.js
@@ -5,7 +5,7 @@ import {
 import { encrypt } from '../../../../../website/src/libs/api-v3/encryption';
 import { v4 as generateUUID } from 'uuid';
 
-describe('GET /unsubscribe', () => {
+describe('GET /email/unsubscribe', () => {
   let user;
   let testEmail = 'test@habitica.com';
 
@@ -14,7 +14,7 @@ describe('GET /unsubscribe', () => {
   });
 
   it('return error when code is not provided', async () => {
-    await expect(user.get('/unsubscribe')).to.eventually.be.rejected.and.eql({
+    await expect(user.get('/email/unsubscribe')).to.eventually.be.rejected.and.eql({
       code: 400,
       error: 'BadRequest',
       message: 'Invalid request parameters.',
@@ -26,7 +26,7 @@ describe('GET /unsubscribe', () => {
       _id: generateUUID(),
     }));
 
-    await expect(user.get(`/unsubscribe?code=${code}`)).to.eventually.be.rejected.and.eql({
+    await expect(user.get(`/email/unsubscribe?code=${code}`)).to.eventually.be.rejected.and.eql({
       code: 404,
       error: 'NotFound',
       message: t('userNotFound'),
@@ -39,7 +39,7 @@ describe('GET /unsubscribe', () => {
       email: user.email,
     }));
 
-    await user.get(`/unsubscribe?code=${code}`);
+    await user.get(`/email/unsubscribe?code=${code}`);
 
     let unsubscribedUser = await user.get('/user');
 
@@ -51,7 +51,7 @@ describe('GET /unsubscribe', () => {
       email: testEmail,
     }));
 
-    let unsubscribedMessage = await user.get(`/unsubscribe?code=${code}`);
+    let unsubscribedMessage = await user.get(`/email/unsubscribe?code=${code}`);
 
     expect(unsubscribedMessage).to.equal('<h1>Unsubscribed successfully!</h1> You won\'t receive any other email from Habitica.');
   });
@@ -61,7 +61,7 @@ describe('GET /unsubscribe', () => {
       email: testEmail,
     }));
 
-    let unsubscribedMessage = await user.get(`/unsubscribe?code=${code}`);
+    let unsubscribedMessage = await user.get(`/email/unsubscribe?code=${code}`);
 
     expect(unsubscribedMessage).to.equal('<h1>Unsubscribed successfully!</h1> You won\'t receive any other email from Habitica.');
   });
diff --git a/website/src/controllers/api-v3/unsubscription.js b/website/src/controllers/api-v3/email.js
similarity index 76%
rename from website/src/controllers/api-v3/unsubscription.js
rename to website/src/controllers/api-v3/email.js
index 5578cd742f..b3af91b340 100644
--- a/website/src/controllers/api-v3/unsubscription.js
+++ b/website/src/controllers/api-v3/email.js
@@ -19,7 +19,7 @@ let api = {};
  */
 api.unsubscribe = {
   method: 'GET',
-  url: '/unsubscribe',
+  url: '/email/unsubscribe',
   middlewares: [],
   async handler (req, res) {
     req.checkQuery({
@@ -41,14 +41,11 @@ api.unsubscribe = {
 
       if (userUpdated.nModified !== 1) throw new NotFound(res.t('userNotFound'));
 
-      res.send(`<h1>${res.t('unsubscribedSuccessfully', null, req.language)}</h1> res.t('unsubscribedTextUsers', null, req.language)`);
+      res.send(`<h1>${res.t('unsubscribedSuccessfully')}</h1> ${res.t('unsubscribedTextUsers')}`);
     } else {
       let unsubscribedEmail = await EmailUnsubscription.findOne({email: data.email});
-      let okResponse = `<h1>${res.t('unsubscribedSuccessfully', null, req.language)}</h1> ${res.t('unsubscribedTextOthers', null, req.language)}`;
-      if (unsubscribedEmail) return res.send(okResponse);
-
-      await EmailUnsubscription.create({email: data.email});
-
+      let okResponse = `<h1>${res.t('unsubscribedSuccessfully')}</h1> ${res.t('unsubscribedTextOthers')}`;
+      if (!unsubscribedEmail) await EmailUnsubscription.create({email: data.email});
       res.send(okResponse);
     }
   },