diff --git a/src/langs/fa.json b/src/langs/fa.json
index ef1ccc0..1ad4aa9 100644
--- a/src/langs/fa.json
+++ b/src/langs/fa.json
@@ -116,6 +116,10 @@
     "setting_imap_description": "تنظیمات IMAP خود را با دقت وارد کنید.",
     "imap_server": "IMAP سرور",
     "imap_port": "IMAP پورت",
+    "setting_pop3": "تنظیمات POP3",
+    "setting_pop3_description": "تنظیمات POP3 خود را با دقت وارد کنید.",
+    "pop3_server": "POP3 سرور",
+    "pop3_port": "POP3 پورت",
     "encryption": "نوع رمزنگاری",
     "record_dns": "رکوردهای DNS",
     "record_dns_description": "در این قسمت میتوانید وضعیت رکوردهای DNS سرویس ایمیل خود را بررسی کنید.",
diff --git a/src/pages/setting/address/components/AddressForm.tsx b/src/pages/setting/address/components/AddressForm.tsx
index 0c3e68c..1ae48a9 100644
--- a/src/pages/setting/address/components/AddressForm.tsx
+++ b/src/pages/setting/address/components/AddressForm.tsx
@@ -88,8 +88,10 @@ const AddressForm: FC<AddressFormProps> = ({ selectedAddress, isEditMode, onCanc
                 password: params.password || undefined,
                 quota: params.quotaMB ? params.quotaMB * 1024 * 1024 : undefined,
                 forwarders: forwarders,
-                templateId: params.templateId,
+                templateId: params.templateId ? params.templateId : undefined,
             }
+
+
             updateAddress({ id: selectedAddress.id, params: updateParams }, {
                 onSuccess: (data) => {
                     toast(data?.data?.message || 'آپدیت با موفقیت انجام شد', 'success')
diff --git a/src/pages/setting/mail-server/MailServer.tsx b/src/pages/setting/mail-server/MailServer.tsx
index 162ae8a..9ed12fa 100644
--- a/src/pages/setting/mail-server/MailServer.tsx
+++ b/src/pages/setting/mail-server/MailServer.tsx
@@ -100,6 +100,44 @@ const MailServer: FC = () => {
                     </div>
                 </div>
             </div>
+
+            {/* POP3 Settings */}
+            <div className='mt-9 border-t pt-9'>
+                <div className='flex xl:flex-row gap-4 flex-col justify-between pb-10'>
+                    <div className='flex-1'>
+                        <div className='xl:text-lg'>
+                            {t('setting.setting_pop3')}
+                        </div>
+                        <div className='xl:text-sm text-xs text-description mt-1.5'>
+                            {t('setting.setting_pop3_description')}
+                        </div>
+                    </div>
+
+                    <div className='flex-1'>
+                        <Input
+                            label={t('setting.pop3_server')}
+                            value={data?.data?.setupInfo?.pop3Settings?.server || ''}
+                            readOnly
+                        />
+                        <div className='mt-8'>
+                            <Input
+                                label={t('setting.pop3_port')}
+                                value={data?.data?.setupInfo?.pop3Settings?.port?.toString() || ''}
+                                readOnly
+                            />
+                        </div>
+                        <div className='mt-8'>
+                            <Input
+                                label={t('setting.encryption')}
+                                value={data?.data?.setupInfo?.pop3Settings?.encryption || ''}
+                                readOnly
+                            />
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+
         </div>
     )
 }