diff --git a/src/controllers/SettingsController.ts b/src/controllers/SettingsController.ts
index d6e9155..523dcc5 100644
--- a/src/controllers/SettingsController.ts
+++ b/src/controllers/SettingsController.ts
@@ -271,9 +271,9 @@ export class SettingsController {
 	public static async UploadCustomEmoji(h: RequestHandler) {
 		const shorcut = h.postEmojiShorcut("shortcut");
 
-		// Check if the user has already a shorcut with the same name
+		// Check if the user has already a shortcut with the same name
 		if(await CustomEmojisHelper.HasUserSimilarShorcut(h.getUserId(), shorcut)) 
-			h.error(401, "A custom emoji with the same shorcut is already defined!")
+			h.error(401, "A custom emoji with the same shortcut is already defined!")
 		
 
 		const path = await h.savePostImage("image", "custom_emojies", 72, 72);
diff --git a/src/entities/BaseRequestsHandler.ts b/src/entities/BaseRequestsHandler.ts
index 31e5a4b..e8921dd 100644
--- a/src/entities/BaseRequestsHandler.ts
+++ b/src/entities/BaseRequestsHandler.ts
@@ -410,7 +410,7 @@ export abstract class BaseRequestsHandler implements AbstractUserConnectionConta
 	}
 
 	/**
-	 * Get the shorcut of an emoji included in a POST request
+	 * Get the shortcut of an emoji included in a POST request
 	 * 
 	 * @param name The name of the POST field containing the id of the emoji
 	 */
diff --git a/src/helpers/CustomEmojisHelper.ts b/src/helpers/CustomEmojisHelper.ts
index a95bcf5..36e997a 100644
--- a/src/helpers/CustomEmojisHelper.ts
+++ b/src/helpers/CustomEmojisHelper.ts
@@ -32,10 +32,10 @@ export class CustomEmojisHelper {
 
 	/**
 	 * Check if a given user has already a custom emoji with
-	 * the same shorcut
+	 * the same shortcut
 	 * 
 	 * @param userID Target user ID
-	 * @param shorcut The name of the shorcut to check
+	 * @param shorcut The name of the shortcut to check
 	 */
 	public static async HasUserSimilarShorcut(userID: number, shorcut: string) : Promise<boolean> {
 		return await DatabaseHelper.Count({