diff --git a/features/org.wso2.carbon.email.mgt.server.feature/resources/email-admin-config.xml b/features/org.wso2.carbon.email.mgt.server.feature/resources/email-admin-config.xml
index a1392a79..552d59d5 100644
--- a/features/org.wso2.carbon.email.mgt.server.feature/resources/email-admin-config.xml
+++ b/features/org.wso2.carbon.email.mgt.server.feature/resources/email-admin-config.xml
@@ -410,7 +410,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{account.recovery.endpoint-url}}/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{callback}}"
+                                                                                                        href="{{account.recovery.endpoint-url}}/confirmrecovery.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;sp={{sp}}&amp;callback={{callback}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span
@@ -2253,7 +2253,7 @@
                                                                                                 <td style="float:left;border-collapse:collapse;line-height:inherit;padding: 10px 0 15px;"
                                                                                                     valign="top" align="center">
                                                                                                     <a class="ctaorange"
-                                                                                                        href="{{account.recovery.endpoint-url}}/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;callback={{callback}}"
+                                                                                                        href="{{account.recovery.endpoint-url}}/confirmregistration.do?confirmation={{confirmation-code}}&amp;userstoredomain={{userstore-domain}}&amp;username={{url:user-name}}&amp;tenantdomain={{tenant-domain}}&amp;sp={{sp}}&amp;callback={{callback}}"
                                                                                                         style="box-sizing:border-box;display:inline-block;font-family:'{{organization.font}}', Roboto, Verdana, Helvetica, sans-serif;text-decoration:none;font-size: 14px; line-height: 24px; font-weight:600; text-align:center;color:{{organization.button.font.color}};background-color:{{organization.color.primary}};border-radius:6px;width:auto;max-width:100%;word-break:break-word;word-wrap:break-word;line-height:inherit"
                                                                                                         target="_blank"><span
                                                                                                             style="display:block;line-height:120%;padding:14px 24px"><span