diff --git a/application/src/components/settings/general/GeneralSettingsPanel.tsx b/application/src/components/settings/general/GeneralSettingsPanel.tsx
index 7480d0c..b43cf48 100644
--- a/application/src/components/settings/general/GeneralSettingsPanel.tsx
+++ b/application/src/components/settings/general/GeneralSettingsPanel.tsx
@@ -47,6 +47,7 @@ const GeneralSettingsPanel: React.FC<GeneralSettingsPanelProps> = () => {
         port: 587,
         host: '',
         username: '',
+        password: '',
         authMethod: '',
         tls: true,
         localName: ''
@@ -73,6 +74,7 @@ const GeneralSettingsPanel: React.FC<GeneralSettingsPanelProps> = () => {
           port: 587,
           host: '',
           username: '',
+          password: '',
           authMethod: '',
           tls: true,
           localName: ''
@@ -131,6 +133,7 @@ const GeneralSettingsPanel: React.FC<GeneralSettingsPanelProps> = () => {
           port: 587,
           host: '',
           username: '',
+          password: '',
           authMethod: '',
           tls: true,
           localName: ''
diff --git a/application/src/components/settings/general/MailSettingsTab.tsx b/application/src/components/settings/general/MailSettingsTab.tsx
index fe6349c..34140cd 100644
--- a/application/src/components/settings/general/MailSettingsTab.tsx
+++ b/application/src/components/settings/general/MailSettingsTab.tsx
@@ -140,6 +140,26 @@ const MailSettingsTab: React.FC<MailSettingsTabProps> = ({
           />
         </div>
         
+        <div className="mt-4">
+          <FormField
+            control={form.control}
+            name="smtp.password"
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>{t("smtpPassword", "settings")}</FormLabel>
+                <FormControl>
+                  <Input 
+                    {...field} 
+                    type="password"
+                    disabled={!isEditing || !form.watch('smtp.enabled')}
+                    placeholder="••••••••"
+                  />
+                </FormControl>
+              </FormItem>
+            )}
+          />
+        </div>
+        
         <div className="mt-4">
           <FormField
             control={form.control}
diff --git a/application/src/services/settingsService.ts b/application/src/services/settingsService.ts
index 4fef9a4..18963b5 100644
--- a/application/src/services/settingsService.ts
+++ b/application/src/services/settingsService.ts
@@ -36,6 +36,7 @@ export interface GeneralSettings {
     port?: number;
     host?: string;
     username?: string;
+    password?: string;
     authMethod?: string;
     tls?: boolean;
     localName?: string;