diff --git a/api/chalicelib/blueprints/bp_core_dynamic.py b/api/chalicelib/blueprints/bp_core_dynamic.py
index 34a755546..375cfd92f 100644
--- a/api/chalicelib/blueprints/bp_core_dynamic.py
+++ b/api/chalicelib/blueprints/bp_core_dynamic.py
@@ -58,6 +58,7 @@ def login():
         'data': {
             "user": r,
             "client": c,
+            "smtp": helper.has_smtp()
         }
     }
 
@@ -74,7 +75,7 @@ def get_account(context):
                 "metadata": metadata.get_remaining_metadata_with_count(context['tenantId'])
             },
             **license.get_status(context["tenantId"]),
-            "smtp": environ["EMAIL_HOST"] is not None and len(environ["EMAIL_HOST"]) > 0
+            "smtp": helper.has_smtp()
         }
     }
 
diff --git a/api/chalicelib/utils/helper.py b/api/chalicelib/utils/helper.py
index 58b071061..ecc2b920a 100644
--- a/api/chalicelib/utils/helper.py
+++ b/api/chalicelib/utils/helper.py
@@ -363,3 +363,7 @@ def get_internal_project_id(project_id64):
         return None
     project_id = int(project_id64)
     return project_id
+
+
+def has_smtp():
+    return environ["EMAIL_HOST"] is not None and len(environ["EMAIL_HOST"]) > 0