diff --git a/packages/email/template-components/template-document-completed.tsx b/packages/email/template-components/template-document-completed.tsx
index 9c9255879..c67fb4017 100644
--- a/packages/email/template-components/template-document-completed.tsx
+++ b/packages/email/template-components/template-document-completed.tsx
@@ -2,7 +2,7 @@ import { Button, Column, Img, Section, Tailwind, Text } from '@react-email/compo
 
 import * as config from '@documenso/tailwind-config';
 
-import TemplateDocumentImage from './template-document-image';
+import { TemplateDocumentImage } from './template-document-image';
 
 export interface TemplateDocumentCompletedProps {
   downloadLink: string;
diff --git a/packages/email/template-components/template-document-invite.tsx b/packages/email/template-components/template-document-invite.tsx
index 10c298cdd..0e2837aa6 100644
--- a/packages/email/template-components/template-document-invite.tsx
+++ b/packages/email/template-components/template-document-invite.tsx
@@ -2,7 +2,7 @@ import { Button, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
-import TemplateDocumentImage from './template-document-image';
+import { TemplateDocumentImage } from './template-document-image';
 
 export interface TemplateDocumentInviteProps {
   inviterName: string;
diff --git a/packages/email/template-components/template-document-pending.tsx b/packages/email/template-components/template-document-pending.tsx
index be7735064..632433ae3 100644
--- a/packages/email/template-components/template-document-pending.tsx
+++ b/packages/email/template-components/template-document-pending.tsx
@@ -2,7 +2,7 @@ import { Column, Img, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
-import TemplateDocumentImage from './template-document-image';
+import { TemplateDocumentImage } from './template-document-image';
 
 export interface TemplateDocumentPendingProps {
   documentName: string;
diff --git a/packages/email/template-components/template-document-self-signed.tsx b/packages/email/template-components/template-document-self-signed.tsx
index 7d1668a09..6f93a7e58 100644
--- a/packages/email/template-components/template-document-self-signed.tsx
+++ b/packages/email/template-components/template-document-self-signed.tsx
@@ -2,7 +2,7 @@ import { Button, Column, Img, Link, Section, Tailwind, Text } from '@react-email
 
 import * as config from '@documenso/tailwind-config';
 
-import TemplateDocumentImage from './template-document-image';
+import { TemplateDocumentImage } from './template-document-image';
 
 export interface TemplateDocumentSelfSignedProps {
   documentName: string;
@@ -49,7 +49,7 @@ export const TemplateDocumentSelfSigned = ({
         <Text className="mx-auto mb-6 mt-1 max-w-[80%] text-center text-base text-slate-400">
           Create a{' '}
           <Link
-            href={`${process.env.NEXT_PUBLIC_WEBAPP_URL}/signup`}
+            href={`${process.env.NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000'}/signup`}
             target="_blank"
             className="text-documenso-700 hover:text-documenso-600 whitespace-nowrap"
           >
diff --git a/packages/email/template-components/template-forgot-password.tsx b/packages/email/template-components/template-forgot-password.tsx
index 128001822..1f1d0438d 100644
--- a/packages/email/template-components/template-forgot-password.tsx
+++ b/packages/email/template-components/template-forgot-password.tsx
@@ -2,7 +2,7 @@ import { Button, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
-import TemplateDocumentImage from './template-document-image';
+import { TemplateDocumentImage } from './template-document-image';
 
 export type TemplateForgotPasswordProps = {
   resetPasswordLink: string;
diff --git a/packages/email/template-components/template-reset-password.tsx b/packages/email/template-components/template-reset-password.tsx
index 36bc93098..45f81be06 100644
--- a/packages/email/template-components/template-reset-password.tsx
+++ b/packages/email/template-components/template-reset-password.tsx
@@ -1,8 +1,8 @@
-import { Section, Tailwind, Text } from '@react-email/components';
+import { Button, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
-import TemplateDocumentImage from './template-document-image';
+import { TemplateDocumentImage } from './template-document-image';
 
 export interface TemplateResetPasswordProps {
   userName: string;
@@ -31,6 +31,15 @@ export const TemplateResetPassword = ({ assetBaseUrl }: TemplateResetPasswordPro
         <Text className="my-1 text-center text-base text-slate-400">
           Your password has been updated.
         </Text>
+
+        <Section className="mb-6 mt-8 text-center">
+          <Button
+            className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
+            href={`${process.env.NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000'}/signin`}
+          >
+            Sign In
+          </Button>
+        </Section>
       </Section>
     </Tailwind>
   );
diff --git a/packages/email/templates/document-completed.tsx b/packages/email/templates/document-completed.tsx
index adaa5d0ed..a5a1a02ba 100644
--- a/packages/email/templates/document-completed.tsx
+++ b/packages/email/templates/document-completed.tsx
@@ -15,7 +15,7 @@ import {
   TemplateDocumentCompleted,
   TemplateDocumentCompletedProps,
 } from '../template-components/template-document-completed';
-import TemplateFooter from '../template-components/template-footer';
+import { TemplateFooter } from '../template-components/template-footer';
 
 export type DocumentCompletedEmailTemplateProps = Partial<TemplateDocumentCompletedProps>;
 
diff --git a/packages/email/templates/document-invite.tsx b/packages/email/templates/document-invite.tsx
index 661a2fd5f..cb3a1e282 100644
--- a/packages/email/templates/document-invite.tsx
+++ b/packages/email/templates/document-invite.tsx
@@ -18,7 +18,7 @@ import {
   TemplateDocumentInvite,
   TemplateDocumentInviteProps,
 } from '../template-components/template-document-invite';
-import TemplateFooter from '../template-components/template-footer';
+import { TemplateFooter } from '../template-components/template-footer';
 
 export type DocumentInviteEmailTemplateProps = Partial<TemplateDocumentInviteProps> & {
   customBody?: string;
diff --git a/packages/email/templates/document-self-signed.tsx b/packages/email/templates/document-self-signed.tsx
index fb3dda8fc..91b2d29f6 100644
--- a/packages/email/templates/document-self-signed.tsx
+++ b/packages/email/templates/document-self-signed.tsx
@@ -15,7 +15,7 @@ import {
   TemplateDocumentSelfSigned,
   TemplateDocumentSelfSignedProps,
 } from '../template-components/template-document-self-signed';
-import TemplateFooter from '../template-components/template-footer';
+import { TemplateFooter } from '../template-components/template-footer';
 
 export type DocumentSelfSignedTemplateProps = TemplateDocumentSelfSignedProps;
 
diff --git a/packages/email/templates/forgot-password.tsx b/packages/email/templates/forgot-password.tsx
index ab3db58f5..61df2ccc3 100644
--- a/packages/email/templates/forgot-password.tsx
+++ b/packages/email/templates/forgot-password.tsx
@@ -11,7 +11,7 @@ import {
 
 import config from '@documenso/tailwind-config';
 
-import TemplateFooter from '../template-components/template-footer';
+import { TemplateFooter } from '../template-components/template-footer';
 import {
   TemplateForgotPassword,
   TemplateForgotPasswordProps,
diff --git a/packages/email/templates/reset-password.tsx b/packages/email/templates/reset-password.tsx
index 35881fe72..ed9929ec7 100644
--- a/packages/email/templates/reset-password.tsx
+++ b/packages/email/templates/reset-password.tsx
@@ -14,7 +14,7 @@ import {
 
 import config from '@documenso/tailwind-config';
 
-import TemplateFooter from '../template-components/template-footer';
+import { TemplateFooter } from '../template-components/template-footer';
 import {
   TemplateResetPassword,
   TemplateResetPasswordProps,