diff --git a/app/src/main/java/it/chalmers/gamma/app/user/UserCreationFacade.java b/app/src/main/java/it/chalmers/gamma/app/user/UserCreationFacade.java
index e20c215ab..4ca672818 100644
--- a/app/src/main/java/it/chalmers/gamma/app/user/UserCreationFacade.java
+++ b/app/src/main/java/it/chalmers/gamma/app/user/UserCreationFacade.java
@@ -1,5 +1,8 @@
 package it.chalmers.gamma.app.user;
 
+import static it.chalmers.gamma.app.authentication.AccessGuard.isAdmin;
+import static it.chalmers.gamma.app.authentication.AccessGuard.isNotSignedIn;
+
 import it.chalmers.gamma.app.Facade;
 import it.chalmers.gamma.app.authentication.AccessGuard;
 import it.chalmers.gamma.app.common.Email;
@@ -10,16 +13,12 @@
 import it.chalmers.gamma.app.user.allowlist.AllowListRepository;
 import it.chalmers.gamma.app.user.domain.*;
 import jakarta.transaction.Transactional;
+import java.util.UUID;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.util.UUID;
-
-import static it.chalmers.gamma.app.authentication.AccessGuard.isAdmin;
-import static it.chalmers.gamma.app.authentication.AccessGuard.isNotSignedIn;
-
 @Service
 public class UserCreationFacade extends Facade {
 
@@ -132,7 +131,14 @@ public void createUserWithCode(
   private void sendEmail(Cid cid, UserActivationToken userActivationToken) {
     String to = cid.getValue() + "@" + MAIL_POSTFIX;
     String resetUrl = baseUrl + "/register?token=" + userActivationToken.value();
-    String message = "Follow this link to finish up creating your account: " + resetUrl + ". \nThe link is valid for 15 minutes.";
+    String message =
+        """
+        Follow this link to finish up creating your account:
+        <a href="%s">%s</a>
+        The link is valid for 15 minutes.
+        """
+            .formatted(resetUrl, resetUrl);
+
     this.mailService.sendMail(to, "Gamma activation url", message);
   }
 
diff --git a/app/src/main/java/it/chalmers/gamma/app/user/passwordreset/UserResetPasswordFacade.java b/app/src/main/java/it/chalmers/gamma/app/user/passwordreset/UserResetPasswordFacade.java
index 3d24e42cf..ec516fe17 100644
--- a/app/src/main/java/it/chalmers/gamma/app/user/passwordreset/UserResetPasswordFacade.java
+++ b/app/src/main/java/it/chalmers/gamma/app/user/passwordreset/UserResetPasswordFacade.java
@@ -1,5 +1,7 @@
 package it.chalmers.gamma.app.user.passwordreset;
 
+import static it.chalmers.gamma.app.authentication.AccessGuard.isNotSignedIn;
+
 import it.chalmers.gamma.app.Facade;
 import it.chalmers.gamma.app.authentication.AccessGuard;
 import it.chalmers.gamma.app.common.Email;
@@ -17,8 +19,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import static it.chalmers.gamma.app.authentication.AccessGuard.isNotSignedIn;
-
 @Service
 public class UserResetPasswordFacade extends Facade {
 
@@ -92,9 +92,12 @@ private void sendPasswordResetTokenMail(Email email, PasswordResetToken token) {
     String resetUrl = this.baseUrl + "/forgot-password/finalize?token=" + token.value();
 
     String message =
-        "A password reset have been requested for this account, if you have not requested "
-            + "this mail, feel free to ignore it. \n Click here to reset password: "
-            + resetUrl + ". \nThe link is valid for 15 minutes.";
+        """
+        A password reset have been requested for this account, if you have not requested this mail, feel free to ignore it.
+        Click here to reset password: <a href="%s">%s</a>
+        The link is valid for 15 minutes.
+        """
+            .formatted(resetUrl, resetUrl);
 
     this.mailService.sendMail(email.value(), subject, message);
   }