diff --git a/server/emails/templates/WelcomeEmail.tsx b/server/emails/templates/WelcomeEmail.tsx
index 57f54ef20..a7cb90796 100644
--- a/server/emails/templates/WelcomeEmail.tsx
+++ b/server/emails/templates/WelcomeEmail.tsx
@@ -41,7 +41,7 @@ ${teamUrl}/home
   }
 
   protected render({ teamUrl }: Props) {
-    const welcomLink = `${teamUrl}/home?ref=welcome-email`;
+    const welcomeLink = `${teamUrl}/home?ref=welcome-email`;
 
     return (
       <EmailTemplate previewText={this.preview()}>
@@ -64,7 +64,7 @@ ${teamUrl}/home
           </p>
           <EmptySpace height={10} />
           <p>
-            <Button href={welcomLink}>Open {env.APP_NAME}</Button>
+            <Button href={welcomeLink}>Open {env.APP_NAME}</Button>
           </p>
         </Body>
 
diff --git a/server/env.ts b/server/env.ts
index 015a51dc1..d014dc8af 100644
--- a/server/env.ts
+++ b/server/env.ts
@@ -41,7 +41,7 @@ export class Environment {
   }
 
   /**
-   * The current envionment name.
+   * The current environment name.
    */
   @IsIn(["development", "production", "staging", "test"])
   public ENVIRONMENT = process.env.NODE_ENV ?? "production";
@@ -442,7 +442,7 @@ export class Environment {
   );
 
   /**
-   * OICD client credentials. To enable authentication with any
+   * OIDC client credentials. To enable authentication with any
    * compatible provider.
    */
   @IsOptional()