diff --git a/apiserver/plane/bgtasks/forgot_password_task.py b/apiserver/plane/bgtasks/forgot_password_task.py
index 9bc7240a4..5348a05da 100644
--- a/apiserver/plane/bgtasks/forgot_password_task.py
+++ b/apiserver/plane/bgtasks/forgot_password_task.py
@@ -73,6 +73,7 @@ def forgot_password(first_name, email, uidb64, token, current_site):
         context = {
             "first_name": first_name,
             "forgot_password_url": abs_url,
+            "email": email,
         }
 
         html_content = render_to_string("emails/auth/forgot_password.html", context)
diff --git a/apiserver/plane/license/api/views/instance.py b/apiserver/plane/license/api/views/instance.py
index 80496ddcd..7edc50b27 100644
--- a/apiserver/plane/license/api/views/instance.py
+++ b/apiserver/plane/license/api/views/instance.py
@@ -116,7 +116,7 @@ class InstanceEndpoint(BaseAPIView):
         if instance is None:
             return Response(
                 {"is_activated": False, "is_setup_done": False},
-                status=status.HTTP_400_BAD_REQUEST,
+                status=status.HTTP_200_OK,
             )
         # Return instance
         serializer = InstanceSerializer(instance)
diff --git a/apiserver/templates/emails/auth/magic_signin.html b/apiserver/templates/emails/auth/magic_signin.html
index 694141b05..4e47487bd 100644
--- a/apiserver/templates/emails/auth/magic_signin.html
+++ b/apiserver/templates/emails/auth/magic_signin.html
@@ -225,11 +225,16 @@
           padding-top: 5px !important;
         }
         .r24-o {
+          border-style: solid !important;
+          margin-right: 8px !important;
+          width: 32px !important;
+        }
+        .r25-o {
           border-style: solid !important;
           margin-right: 0px !important;
           width: 32px !important;
         }
-        .r25-i {
+        .r26-i {
           padding-bottom: 0px !important;
           padding-top: 5px !important;
           text-align: center !important;
@@ -1246,14 +1251,13 @@
                                                                   role="presentation"
                                                                   width="100%"
                                                                   class="r22-o"
+                                                                  class="r24-o"
                                                                   style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
                                                                 >
                                                                   <tr>
                                                                     <td
                                                                       class="r23-i"
+                                                                      class="r17-i"
                                                                       style="
                                                                         font-size: 0px;
                                                                         line-height: 0px;
@@ -1305,7 +1309,7 @@
                                                                   border="0"
                                                                   role="presentation"
                                                                   width="100%"
-                                                                  class="r24-o"
+                                                                  class="r25-o"
                                                                   style="
                                                                     table-layout: fixed;
                                                                     width: 100%;
@@ -1437,7 +1441,7 @@
                                             <td
                                               align="center"
                                               valign="top"
-                                              class="r25-i nl2go-default-textstyle"
+                                              class="r26-i nl2go-default-textstyle"
                                               style="
                                                 color: #3b3f44;
                                                 font-family: georgia, serif;