@@ -941,6 +941,9 @@ public ApiResponse resendEmail(
941941
942942 payload .put ("version" , "v3" );
943943 payload .put ("sendgrid_template_id" , this .getSendgridTemplateId ());
944+ if (user .getRegSource () != null && user .getRegSource ().matches ("selfService" )) {
945+ payload .put ("sendgrid_template_id" , this .getSendgridSelfServiceTemplateId ());
946+ }
944947
945948 ArrayList <String > recipients = new ArrayList <String >();
946949 recipients .add (user .getEmail ());
@@ -1856,6 +1859,9 @@ private void sendActivationEmailEvent(User user, String redirectUrl) {
18561859
18571860 payload .put ("version" , "v3" );
18581861 payload .put ("sendgrid_template_id" , this .getSendgridTemplateId ());
1862+ if (user .getRegSource () != null && user .getRegSource ().matches ("selfService" )) {
1863+ payload .put ("sendgrid_template_id" , this .getSendgridSelfServiceTemplateId ());
1864+ }
18591865
18601866 ArrayList <String > recipients = new ArrayList <String >();
18611867 recipients .add (user .getEmail ());
@@ -1888,6 +1894,9 @@ private void sendWelcomeEmailEvent(User user) {
18881894
18891895 payload .put ("version" , "v3" );
18901896 payload .put ("sendgrid_template_id" , this .getSendgridWelcomeTemplateId ());
1897+ if (user .getRegSource () != null && user .getRegSource ().matches ("selfService" )) {
1898+ payload .put ("sendgrid_template_id" , this .getSendgridSelfServiceWelcomeTemplateId ());
1899+ }
18911900
18921901 ArrayList <String > recipients = new ArrayList <String >();
18931902 recipients .add (user .getEmail ());
0 commit comments