diff --git a/backend/src/main/java/com/krrishg/service/EmailService.java b/backend/src/main/java/com/krrishg/service/EmailService.java
index 7c0caca..4d8f782 100644
--- a/backend/src/main/java/com/krrishg/service/EmailService.java
+++ b/backend/src/main/java/com/krrishg/service/EmailService.java
@@ -16,11 +16,14 @@ public class EmailService {
 
     private final JavaMailSender mailSender;
     private final String baseUrl;
+    private final String from;
 
     public EmailService(JavaMailSender mailSender,
-                        @Value("${indie.app.base-url}") String baseUrl) {
+                        @Value("${indie.app.base-url}") String baseUrl,
+                        @Value("${spring.mail.from}") String from) {
         this.mailSender = mailSender;
         this.baseUrl = baseUrl;
+        this.from = from;
     }
 
     public void sendVerificationEmail(String to, String name, String token) {
@@ -67,6 +70,7 @@ public class EmailService {
         try {
             MimeMessage message = mailSender.createMimeMessage();
             MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
+            helper.setFrom(from);
             helper.setTo(to);
             helper.setSubject(subject);
             helper.setText(html, true);
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index f845ef3..a6879da 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -31,6 +31,7 @@ spring:
     port: ${EMAIL_PORT:1025}
     username: ${EMAIL_USERNAME:}
     password: ${EMAIL_PASSWORD:}
+    from: ${EMAIL_FROM:mailme@krrishg.com}
     properties:
       mail:
         smtp:
diff --git a/backend/src/test/java/com/krrishg/support/StubEmailService.java b/backend/src/test/java/com/krrishg/support/StubEmailService.java
index 2f2ec72..4598515 100644
--- a/backend/src/test/java/com/krrishg/support/StubEmailService.java
+++ b/backend/src/test/java/com/krrishg/support/StubEmailService.java
@@ -9,7 +9,7 @@ public class StubEmailService extends EmailService {
     private int sendCount;
 
     public StubEmailService() {
-        super(null, "http://localhost:4200");
+        super(null, "http://localhost:4200", "noreply@indie.app");
     }
 
     @Override