diff --git a/app/api/batch/update-based-on.ts b/app/api/batch/update-based-on.ts
index 770c5d21..4a0b9769 100644
--- a/app/api/batch/update-based-on.ts
+++ b/app/api/batch/update-based-on.ts
@@ -16,7 +16,7 @@ export class UpdateBasedOn
     dotenv.config();
     console.log(process.env.ENV_NAME);
 
-    // initialize database and authentification middleware
+    // initialize database and authentication middleware
     this.db = new Database();
 
     setTimeout(this.updateBaseOn, 3000);
diff --git a/app/api/batch/update-position-correction.ts b/app/api/batch/update-position-correction.ts
index 184ca635..7a786dae 100644
--- a/app/api/batch/update-position-correction.ts
+++ b/app/api/batch/update-position-correction.ts
@@ -16,7 +16,7 @@ export class UpdatePositionCorrection
     dotenv.config();
     console.log(process.env.ENV_NAME);
 
-    // initialize database and authentification middleware
+    // initialize database and authentication middleware
     this.db = new Database();
 
     setTimeout(this.updateBaseOn, 3000);
diff --git a/app/api/batch/update-thumbnail.ts b/app/api/batch/update-thumbnail.ts
index 77e57848..32df3ae3 100644
--- a/app/api/batch/update-thumbnail.ts
+++ b/app/api/batch/update-thumbnail.ts
@@ -48,7 +48,7 @@ export class UpdateThumbnail
     OniItem.init();
     OniItem.load(buildings);
 
-    // initialize database and authentification middleware
+    // initialize database and authentication middleware
     this.db = new Database();
 
     setTimeout(this.updateThumbnail, 3000);
diff --git a/app/app.ts b/app/app.ts
index 5b15d742..de4f9963 100644
--- a/app/app.ts
+++ b/app/app.ts
@@ -55,7 +55,7 @@ class App
     OniItem.init();
     OniItem.load(buildings);
 
-    // initialize database and authentification middleware
+    // initialize database and authentication middleware
     this.db = new Database();
     this.auth = new Auth();
 
diff --git a/app/routes.ts b/app/routes.ts
index b6533379..da18fa1b 100644
--- a/app/routes.ts
+++ b/app/routes.ts
@@ -16,7 +16,7 @@ export class Routes {
   public uploadBlueprintController = new BlueprintController();
 
   public routes(app: Application): void {
-    // Initialize authentification middleware
+    // Initialize authentication middleware
     //let auth = expressJwt({secret: process.env.JWT_SECRET as string, userProperty: 'tokenPayload' });
     let auth = expressJwt({secret: process.env.JWT_SECRET as string });
     let recaptcha = new Recaptcha(process.env.CAPTCHA_SITE as string, process.env.CAPTCHA_SECRET as string);
diff --git a/frontend/src/app/module-blueprint/components/user-auth/login-form/login-form.component.html b/frontend/src/app/module-blueprint/components/user-auth/login-form/login-form.component.html
index 9391b18e..b43af0d2 100644
--- a/frontend/src/app/module-blueprint/components/user-auth/login-form/login-form.component.html
+++ b/frontend/src/app/module-blueprint/components/user-auth/login-form/login-form.component.html
@@ -19,7 +19,7 @@
   <div *ngIf="f.password.invalid && (f.password.dirty || f.password.touched)" class="error-red">
     <div *ngIf="f.password.errors.required" i18n>Password is required.</div>
   </div>
-  <div *ngIf="authError" class="error-red" i18n>Authentification error</div>
+  <div *ngIf="authError" class="error-red" i18n>Authentication error</div>
 
   <br>
   <a [routerLink]="" (click)="registration()" i18n>First registration ?</a>
diff --git a/frontend/src/app/module-blueprint/components/user-auth/register-form/register-form.component.html b/frontend/src/app/module-blueprint/components/user-auth/register-form/register-form.component.html
index d5671e36..24285d20 100644
--- a/frontend/src/app/module-blueprint/components/user-auth/register-form/register-form.component.html
+++ b/frontend/src/app/module-blueprint/components/user-auth/register-form/register-form.component.html
@@ -38,7 +38,7 @@
     <label for="inputtext" i18n>Confirm Password</label>
   </span>
   <div *ngIf="registerForm.errors?.invalid" class="error-red" i18n>Passwords must match.</div>
-  <div *ngIf="authError" class="error-red" i18n>Authentification error</div>
+  <div *ngIf="authError" class="error-red" i18n>Authentication error</div>
   <div *ngIf="duplicateError" class="error-red" i18n>Username or e-mail is already registered</div>
 
   <br>
diff --git a/frontend/src/i18n/messages.ko.xlf b/frontend/src/i18n/messages.ko.xlf
index ca4055b7..12aa39e7 100644
--- a/frontend/src/i18n/messages.ko.xlf
+++ b/frontend/src/i18n/messages.ko.xlf
@@ -1193,8 +1193,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="038e19d9a187e8ecd9959a0677daefd337eb1838" datatype="html">
-        <source>Authentification error</source>
-        <target state="new">Authentification error</target>
+        <source>Authentication error</source>
+        <target state="new">Authentication error</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/module-blueprint/components/user-auth/login-form/login-form.component.html</context>
           <context context-type="linenumber">22</context>
diff --git a/frontend/src/i18n/messages.ru.xlf b/frontend/src/i18n/messages.ru.xlf
index 88d27a09..47ebdbb7 100644
--- a/frontend/src/i18n/messages.ru.xlf
+++ b/frontend/src/i18n/messages.ru.xlf
@@ -1193,8 +1193,8 @@
         </context-group>
       </trans-unit>
       <trans-unit id="038e19d9a187e8ecd9959a0677daefd337eb1838" datatype="html">
-        <source>Authentification error</source>
-        <target state="new">Authentification error</target>
+        <source>Authentication error</source>
+        <target state="new">Authentication error</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/module-blueprint/components/user-auth/login-form/login-form.component.html</context>
           <context context-type="linenumber">22</context>
diff --git a/frontend/src/i18n/messages.xlf b/frontend/src/i18n/messages.xlf
index 675c5cb0..b2bb590c 100644
--- a/frontend/src/i18n/messages.xlf
+++ b/frontend/src/i18n/messages.xlf
@@ -1052,7 +1052,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="038e19d9a187e8ecd9959a0677daefd337eb1838" datatype="html">
-        <source>Authentification error</source>
+        <source>Authentication error</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/module-blueprint/components/user-auth/login-form/login-form.component.html</context>
           <context context-type="linenumber">22</context>
diff --git a/frontend/src/i18n/messages.zh-Hans.xlf b/frontend/src/i18n/messages.zh-Hans.xlf
index 1b197d2b..0c8d650f 100644
--- a/frontend/src/i18n/messages.zh-Hans.xlf
+++ b/frontend/src/i18n/messages.zh-Hans.xlf
@@ -1193,7 +1193,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="038e19d9a187e8ecd9959a0677daefd337eb1838" datatype="html">
-        <source>Authentification error</source>
+        <source>Authentication error</source>
         <target state="translated">认证错误</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/module-blueprint/components/user-auth/login-form/login-form.component.html</context>