diff --git a/index.html b/index.html
index faa52b0..d903a5e 100644
--- a/index.html
+++ b/index.html
@@ -832,16 +832,16 @@
                                         </div>
                                         <div id="smtp-custom-fields">
                                             <div class="form-group"><label>Palvelin</label><input type="text" id="mailbox-form-smtp-host" placeholder="mail.yritys.fi"></div>
-                                            <div class="form-group"><label>Portti</label><input type="number" id="mailbox-form-smtp-port" value="587" placeholder="587"></div>
                                             <div class="form-group"><label>Käyttäjätunnus</label><input type="text" id="mailbox-form-smtp-user" placeholder="asiakaspalvelu@yritys.fi"></div>
                                             <div class="form-group"><label>Salasana</label><input type="password" id="mailbox-form-smtp-pass" placeholder="••••••••"></div>
-                                            <div class="form-group"><label>Salaus</label>
-                                                <select id="mailbox-form-smtp-encryption">
-                                                    <option value="tls">STARTTLS</option>
-                                                    <option value="ssl">SSL</option>
-                                                    <option value="none">Ei salausta</option>
-                                                </select>
-                                            </div>
+                                        </div>
+                                        <div class="form-group"><label>Portti</label><input type="number" id="mailbox-form-smtp-port" value="587" placeholder="587"></div>
+                                        <div class="form-group"><label>Salaus</label>
+                                            <select id="mailbox-form-smtp-encryption">
+                                                <option value="tls">STARTTLS</option>
+                                                <option value="ssl">SSL</option>
+                                                <option value="none">Ei salausta</option>
+                                            </select>
                                         </div>
                                     </div>
                                 </div>
diff --git a/script.js b/script.js
index 251c929..4ed88dc 100644
--- a/script.js
+++ b/script.js
@@ -2583,10 +2583,10 @@ document.getElementById('btn-save-mailbox').addEventListener('click', async () =
         smtp_from_email: document.getElementById('mailbox-form-smtp-email').value,
         smtp_from_name: document.getElementById('mailbox-form-smtp-name').value,
         smtp_host: useSame ? imapHost : document.getElementById('mailbox-form-smtp-host').value,
-        smtp_port: useSame ? 587 : (parseInt(document.getElementById('mailbox-form-smtp-port').value) || 587),
+        smtp_port: parseInt(document.getElementById('mailbox-form-smtp-port').value) || 587,
         smtp_user: useSame ? imapUser : document.getElementById('mailbox-form-smtp-user').value,
         smtp_password: useSame ? imapPass : document.getElementById('mailbox-form-smtp-pass').value,
-        smtp_encryption: useSame ? 'tls' : document.getElementById('mailbox-form-smtp-encryption').value,
+        smtp_encryption: document.getElementById('mailbox-form-smtp-encryption').value,
         aktiivinen: true,
     };
     try {