diff --git a/src/eu/siacs/conversations/ui/EditAccount.java b/src/eu/siacs/conversations/ui/EditAccount.java
index 46f4ecfa5..8b1c0fa64 100644
--- a/src/eu/siacs/conversations/ui/EditAccount.java
+++ b/src/eu/siacs/conversations/ui/EditAccount.java
@@ -132,9 +132,9 @@ public class EditAccount extends DialogFragment {
 					account.setServer(server);
 				} else {
 					account = new Account(username, server, password);
+					account.setOption(Account.OPTION_USETLS, true);
+					account.setOption(Account.OPTION_USECOMPRESSION, true);
 				}
-				account.setOption(Account.OPTION_USETLS, true);
-				account.setOption(Account.OPTION_USECOMPRESSION, true);
 				account.setOption(Account.OPTION_REGISTER, register.isChecked());
 				if (listener != null) {
 					listener.onAccountEdited(account);