diff --git a/apiserver/plane/bgtasks/analytic_plot_export.py b/apiserver/plane/bgtasks/analytic_plot_export.py
index c797f68a5..e6788df79 100644
--- a/apiserver/plane/bgtasks/analytic_plot_export.py
+++ b/apiserver/plane/bgtasks/analytic_plot_export.py
@@ -55,6 +55,7 @@ def send_export_email(email, slug, csv_buffer, rows):
         EMAIL_HOST_PASSWORD,
         EMAIL_PORT,
         EMAIL_USE_TLS,
+        EMAIL_USE_SSL,
         EMAIL_FROM,
     ) = get_email_configuration()
 
@@ -64,6 +65,7 @@ def send_export_email(email, slug, csv_buffer, rows):
         username=EMAIL_HOST_USER,
         password=EMAIL_HOST_PASSWORD,
         use_tls=EMAIL_USE_TLS == "1",
+        use_ssl=EMAIL_USE_SSL == "1",
     )
 
     msg = EmailMultiAlternatives(
diff --git a/apiserver/plane/bgtasks/email_notification_task.py b/apiserver/plane/bgtasks/email_notification_task.py
index 26c3f6b8f..682ccb4a3 100644
--- a/apiserver/plane/bgtasks/email_notification_task.py
+++ b/apiserver/plane/bgtasks/email_notification_task.py
@@ -185,6 +185,7 @@ def send_email_notification(
                 EMAIL_HOST_PASSWORD,
                 EMAIL_PORT,
                 EMAIL_USE_TLS,
+                EMAIL_USE_SSL,
                 EMAIL_FROM,
             ) = get_email_configuration()
 
@@ -288,6 +289,7 @@ def send_email_notification(
                     username=EMAIL_HOST_USER,
                     password=EMAIL_HOST_PASSWORD,
                     use_tls=EMAIL_USE_TLS == "1",
+                    use_ssl=EMAIL_USE_SSL == "1",
                 )
 
                 msg = EmailMultiAlternatives(
diff --git a/apiserver/plane/bgtasks/forgot_password_task.py b/apiserver/plane/bgtasks/forgot_password_task.py
index 13dd505df..b30c9311f 100644
--- a/apiserver/plane/bgtasks/forgot_password_task.py
+++ b/apiserver/plane/bgtasks/forgot_password_task.py
@@ -26,6 +26,7 @@ def forgot_password(first_name, email, uidb64, token, current_site):
             EMAIL_HOST_PASSWORD,
             EMAIL_PORT,
             EMAIL_USE_TLS,
+            EMAIL_USE_SSL,
             EMAIL_FROM,
         ) = get_email_configuration()
 
@@ -49,6 +50,7 @@ def forgot_password(first_name, email, uidb64, token, current_site):
             username=EMAIL_HOST_USER,
             password=EMAIL_HOST_PASSWORD,
             use_tls=EMAIL_USE_TLS == "1",
+            use_ssl=EMAIL_USE_SSL == "1",
         )
 
         msg = EmailMultiAlternatives(
diff --git a/apiserver/plane/bgtasks/magic_link_code_task.py b/apiserver/plane/bgtasks/magic_link_code_task.py
index 8698bebe6..4544e9889 100644
--- a/apiserver/plane/bgtasks/magic_link_code_task.py
+++ b/apiserver/plane/bgtasks/magic_link_code_task.py
@@ -23,6 +23,7 @@ def magic_link(email, key, token, current_site):
             EMAIL_HOST_PASSWORD,
             EMAIL_PORT,
             EMAIL_USE_TLS,
+            EMAIL_USE_SSL,
             EMAIL_FROM,
         ) = get_email_configuration()
 
@@ -41,6 +42,7 @@ def magic_link(email, key, token, current_site):
             username=EMAIL_HOST_USER,
             password=EMAIL_HOST_PASSWORD,
             use_tls=EMAIL_USE_TLS == "1",
+            use_ssl=EMAIL_USE_SSL == "1",
         )
 
         msg = EmailMultiAlternatives(
diff --git a/apiserver/plane/bgtasks/project_invitation_task.py b/apiserver/plane/bgtasks/project_invitation_task.py
index cbb440130..b60c49da1 100644
--- a/apiserver/plane/bgtasks/project_invitation_task.py
+++ b/apiserver/plane/bgtasks/project_invitation_task.py
@@ -52,6 +52,7 @@ def project_invitation(email, project_id, token, current_site, invitor):
             EMAIL_HOST_PASSWORD,
             EMAIL_PORT,
             EMAIL_USE_TLS,
+            EMAIL_USE_SSL,
             EMAIL_FROM,
         ) = get_email_configuration()
 
@@ -61,6 +62,7 @@ def project_invitation(email, project_id, token, current_site, invitor):
             username=EMAIL_HOST_USER,
             password=EMAIL_HOST_PASSWORD,
             use_tls=EMAIL_USE_TLS == "1",
+            use_ssl=EMAIL_USE_SSL == "1",
         )
 
         msg = EmailMultiAlternatives(
diff --git a/apiserver/plane/bgtasks/webhook_task.py b/apiserver/plane/bgtasks/webhook_task.py
index fe59ce939..6537e3b21 100644
--- a/apiserver/plane/bgtasks/webhook_task.py
+++ b/apiserver/plane/bgtasks/webhook_task.py
@@ -257,6 +257,7 @@ def send_webhook_deactivation_email(
         EMAIL_HOST_PASSWORD,
         EMAIL_PORT,
         EMAIL_USE_TLS,
+        EMAIL_USE_SSL,
         EMAIL_FROM,
     ) = get_email_configuration()
 
@@ -285,6 +286,7 @@ def send_webhook_deactivation_email(
             username=EMAIL_HOST_USER,
             password=EMAIL_HOST_PASSWORD,
             use_tls=EMAIL_USE_TLS == "1",
+            use_ssl=EMAIL_USE_SSL == "1",
         )
 
         msg = EmailMultiAlternatives(
diff --git a/apiserver/plane/bgtasks/workspace_invitation_task.py b/apiserver/plane/bgtasks/workspace_invitation_task.py
index 46837731a..c0b945e62 100644
--- a/apiserver/plane/bgtasks/workspace_invitation_task.py
+++ b/apiserver/plane/bgtasks/workspace_invitation_task.py
@@ -37,6 +37,7 @@ def workspace_invitation(email, workspace_id, token, current_site, invitor):
             EMAIL_HOST_PASSWORD,
             EMAIL_PORT,
             EMAIL_USE_TLS,
+            EMAIL_USE_SSL,
             EMAIL_FROM,
         ) = get_email_configuration()
 
@@ -65,6 +66,7 @@ def workspace_invitation(email, workspace_id, token, current_site, invitor):
             username=EMAIL_HOST_USER,
             password=EMAIL_HOST_PASSWORD,
             use_tls=EMAIL_USE_TLS == "1",
+            use_ssl=EMAIL_USE_SSL == "1",
         )
 
         msg = EmailMultiAlternatives(
diff --git a/apiserver/plane/license/utils/instance_value.py b/apiserver/plane/license/utils/instance_value.py
index bc4fd5d21..4c191feda 100644
--- a/apiserver/plane/license/utils/instance_value.py
+++ b/apiserver/plane/license/utils/instance_value.py
@@ -64,6 +64,10 @@ def get_email_configuration():
                 "key": "EMAIL_USE_TLS",
                 "default": os.environ.get("EMAIL_USE_TLS", "1"),
             },
+            {
+                "key": "EMAIL_USE_SSL",
+                "default": os.environ.get("EMAIL_USE_SSL", "0"),
+            },
             {
                 "key": "EMAIL_FROM",
                 "default": os.environ.get(
diff --git a/web/components/instance/email-form.tsx b/web/components/instance/email-form.tsx
index 664b96ea2..c00a85a03 100644
--- a/web/components/instance/email-form.tsx
+++ b/web/components/instance/email-form.tsx
@@ -18,7 +18,7 @@ export interface EmailFormValues {
   EMAIL_HOST_USER: string;
   EMAIL_HOST_PASSWORD: string;
   EMAIL_USE_TLS: string;
-  // EMAIL_USE_SSL: string;
+  EMAIL_USE_SSL: string;
   EMAIL_FROM: string;
 }
 
@@ -41,7 +41,7 @@ export const InstanceEmailForm: FC<IInstanceEmailForm> = (props) => {
       EMAIL_HOST_USER: config["EMAIL_HOST_USER"],
       EMAIL_HOST_PASSWORD: config["EMAIL_HOST_PASSWORD"],
       EMAIL_USE_TLS: config["EMAIL_USE_TLS"],
-      // EMAIL_USE_SSL: config["EMAIL_USE_SSL"],
+      EMAIL_USE_SSL: config["EMAIL_USE_SSL"],
       EMAIL_FROM: config["EMAIL_FROM"],
     },
   });
@@ -218,7 +218,7 @@ export const InstanceEmailForm: FC<IInstanceEmailForm> = (props) => {
           </div>
         </div>
 
-        {/* <div className="flex items-center gap-10 pt-4 mr-8">
+        <div className="flex items-center gap-10 pt-4 mr-8">
           <div className="grow">
             <div className="text-custom-text-100 font-medium text-sm">
               Turn SSL {Boolean(parseInt(watch("EMAIL_USE_SSL"))) ? "off" : "on"}
@@ -242,7 +242,7 @@ export const InstanceEmailForm: FC<IInstanceEmailForm> = (props) => {
               )}
             />
           </div>
-        </div> */}
+        </div>
       </div>
 
       <div className="flex max-w-4xl items-center py-1">
diff --git a/web/pages/god-mode/authorization.tsx b/web/pages/god-mode/authorization.tsx
index f4eeefc65..3f18ab9d2 100644
--- a/web/pages/god-mode/authorization.tsx
+++ b/web/pages/god-mode/authorization.tsx
@@ -91,12 +91,11 @@ const InstanceAdminAuthorizationPage: NextPageWithLayout = observer(() => {
                 <div className={`shrink-0 ${isSubmitting && "opacity-70"}`}>
                   <ToggleSwitch
                     value={Boolean(parseInt(enableMagicLogin))}
-                    // onChange={() => {
-                    //   Boolean(parseInt(enableMagicLogin)) === true
-                    //     ? updateConfig("ENABLE_MAGIC_LINK_LOGIN", "0")
-                    //     : updateConfig("ENABLE_MAGIC_LINK_LOGIN", "1");
-                    // }}
-                    onChange={() => {}}
+                    onChange={() => {
+                      Boolean(parseInt(enableMagicLogin)) === true
+                        ? updateConfig("ENABLE_MAGIC_LINK_LOGIN", "0")
+                        : updateConfig("ENABLE_MAGIC_LINK_LOGIN", "1");
+                    }}
                     size="sm"
                     disabled={isSubmitting}
                   />