diff --git a/web/messages/en/common.json b/web/messages/en/common.json
index b12f35212c..4e9a02a369 100644
--- a/web/messages/en/common.json
+++ b/web/messages/en/common.json
@@ -45,6 +45,7 @@
   "state_enabled": "Enabled",
   "state_not_configured": "Not configured",
   "state_smtp_not_configured": "SMTP configuration has not been completed by the administrator.",
+  "state_smtp_not_configured_admin": "SMTP not configured. Please configure SMTP to send enrollment details by email.",
   "state_step": "Step {step}",
   "state_pending": "Pending",
   "state_enrolled": "Enrolled",
diff --git a/web/src/pages/UsersOverviewPage/modals/EnrollmentTokenModal/EnrollmentTokenModal.tsx b/web/src/pages/UsersOverviewPage/modals/EnrollmentTokenModal/EnrollmentTokenModal.tsx
index b0957ac33c..3199fbea51 100644
--- a/web/src/pages/UsersOverviewPage/modals/EnrollmentTokenModal/EnrollmentTokenModal.tsx
+++ b/web/src/pages/UsersOverviewPage/modals/EnrollmentTokenModal/EnrollmentTokenModal.tsx
@@ -6,6 +6,8 @@ import api from '../../../../shared/api/api';
 import { AppText } from '../../../../shared/defguard-ui/components/AppText/AppText';
 import { Checkbox } from '../../../../shared/defguard-ui/components/Checkbox/Checkbox';
 import { CopyField } from '../../../../shared/defguard-ui/components/CopyField/CopyField';
+import { IconKind } from '../../../../shared/defguard-ui/components/Icon/icon-types';
+import { InfoBanner } from '../../../../shared/defguard-ui/components/InfoBanner/InfoBanner';
 import { Modal } from '../../../../shared/defguard-ui/components/Modal/Modal';
 import { ModalControls } from '../../../../shared/defguard-ui/components/ModalControls/ModalControls';
 import { SizedBox } from '../../../../shared/defguard-ui/components/SizedBox/SizedBox';
@@ -149,26 +151,34 @@ const ModalContent = ({ user, appInfo, enrollmentResponse }: ModalData) => {
         data-testid="activation-token-field"
         text={enrollmentResponse.enrollment_token}
       />
-      {appInfo.smtp_enabled && (
-        <>
-          <SizedBox height={ThemeSpacing.Xl3} />
-          <form.AppForm>
-            <Checkbox
-              text={m.modal_add_user_enrollment_form_label_send()}
-              active={sendEmail}
-              onClick={() => setSendEmail((s) => !s)}
+      <SizedBox height={ThemeSpacing.Xl3} />
+      <form.AppForm>
+        {!appInfo.smtp_enabled && (
+          <>
+            <InfoBanner
+              icon={IconKind.InfoFilled}
+              text={m.state_smtp_not_configured_admin()}
+              variant="warning"
             />
-            {sendEmail && (
-              <>
-                <SizedBox height={ThemeSpacing.Xl} />
-                <form.AppField name="email">
-                  {(field) => <field.FormInput label={m.form_label_email()} />}
-                </form.AppField>
-              </>
-            )}
-          </form.AppForm>
-        </>
-      )}
+            <SizedBox height={ThemeSpacing.Md} />
+          </>
+        )}
+        <Checkbox
+          text={m.modal_add_user_enrollment_form_label_send()}
+          active={sendEmail}
+          disabled={!appInfo.smtp_enabled}
+          onClick={() => setSendEmail((s) => !s)}
+        />
+        {sendEmail && (
+          <>
+            <SizedBox height={ThemeSpacing.Xl} />
+            <form.AppField name="email">
+              {(field) => <field.FormInput label={m.form_label_email()} required />}
+            </form.AppField>
+          </>
+        )}
+      </form.AppForm>
+
       <form.Subscribe>
         {() => (
           <ModalControls
diff --git a/web/src/shared/defguard-ui b/web/src/shared/defguard-ui
index 469cde2a3e..1e23390170 160000
--- a/web/src/shared/defguard-ui
+++ b/web/src/shared/defguard-ui
@@ -1 +1 @@
-Subproject commit 469cde2a3ed4d9489f9f0104b5df2853c5043e20
+Subproject commit 1e233901705301a079f475209666b6d485e38a19