diff --git a/.editorconfig b/.editorconfig
index 779521b1dcf6e28a240d501265a3ffe506208082..8370c6e461cd1412aaf83739717dcfedd7191365 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,7 +1,15 @@
 [*]
 charset=utf-8
 end_of_line=lf
-insert_final_newline=false
+insert_final_newline=true
+indent_style=space
+indent_size=4
+
+[{*.mod,*.dtd,*.ent,*.elt}]
+indent_style=space
+indent_size=2
+
+[{*.jhm,*.rng,*.wsdl,*.fxml,*.xslt,*.jrxml,*.ant,*.xul,*.xsl,*.xsd,*.tld,*.jnlp,*.xml}]
 indent_style=space
 indent_size=2
 
@@ -9,6 +17,10 @@ indent_size=2
 indent_style=space
 indent_size=2
 
+[*.java]
+indent_style=space
+indent_size=2
+
 [{*.kts,*.kt}]
 indent_style=space
 indent_size=2
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/user/UserSetupActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/user/UserSetupActivity.kt
index 52d1f539c650744960d7e67314426e4552bcf1e7..5e64ff0d67bd657d29023a34ac5439fb5c2b7069 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/user/UserSetupActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/user/UserSetupActivity.kt
@@ -43,44 +43,44 @@ class UserSetupActivity : ServiceBoundSetupActivity() {
     }
 
   override fun onDone(data: Bundle) {
-      val network = data.getSerializable("network") as? DefaultNetwork
-      if (network != null) {
-        viewModel.backend?.value?.ifPresent { backend ->
-          viewModel.session.value?.orNull()?.rpcHandler?.apply {
-            createIdentity(Defaults.identity(this@UserSetupActivity).apply {
-              setIdentityName(this@UserSetupActivity.getString(R.string.default_identity_identity_name))
-              setNicks(listOf(data.getString("nick")))
-              setRealName(data.getString("realname"))
-            }, emptyMap())
+    val network = data.getSerializable("network") as? DefaultNetwork
+    if (network != null) {
+      viewModel.backend?.value?.ifPresent { backend ->
+        viewModel.session.value?.orNull()?.rpcHandler?.apply {
+          createIdentity(Defaults.identity(this@UserSetupActivity).apply {
+            setIdentityName(this@UserSetupActivity.getString(R.string.default_identity_identity_name))
+            setNicks(listOf(data.getString("nick")))
+            setRealName(data.getString("realname"))
+          }, emptyMap())
 
-            viewModel.identities
-              .map(Map<IdentityId, Identity>::values)
-              .filter(Collection<Identity>::isNotEmpty)
-              .map(Collection<Identity>::first)
-              .firstElement()
-              .toLiveData().observe(this@UserSetupActivity, Observer {
-                if (it != null) {
-                  createNetwork(INetwork.NetworkInfo(
-                    networkName = network.name,
-                    identity = it.id(),
-                    serverList = network.servers.map {
-                      INetwork.Server(
-                        host = it.host,
-                        port = it.port,
-                        useSsl = it.secure
-                      )
-                    }
-                  ), data.getStringArray("channels")?.toList().orEmpty())
+          viewModel.identities
+            .map(Map<IdentityId, Identity>::values)
+            .filter(Collection<Identity>::isNotEmpty)
+            .map(Collection<Identity>::first)
+            .firstElement()
+            .toLiveData().observe(this@UserSetupActivity, Observer {
+              if (it != null) {
+                createNetwork(INetwork.NetworkInfo(
+                  networkName = network.name,
+                  identity = it.id(),
+                  serverList = network.servers.map {
+                    INetwork.Server(
+                      host = it.host,
+                      port = it.port,
+                      useSsl = it.secure
+                    )
+                  }
+                ), data.getStringArray("channels")?.toList().orEmpty())
 
-                  backend.requestConnectNewNetwork()
-
-                  setResult(Activity.RESULT_OK)
-                  finish()
-                }
-              })
-          }
+                backend.requestConnectNewNetwork()
+              }
+            })
         }
       }
+    }
+
+    setResult(Activity.RESULT_OK)
+    finish()
   }
 
   override val fragments = listOf(
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/user/UserSetupNetworkSlide.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/user/UserSetupNetworkSlide.kt
index 6021acea7b058a04b3c47cbe20028551a21999f5..2008713d38aec236187d44019a288510565f0c38 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/user/UserSetupNetworkSlide.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/user/UserSetupNetworkSlide.kt
@@ -174,6 +174,15 @@ class UserSetupNetworkSlide : SlideFragment() {
       }
     }
 
+    sslEnabled.setOnCheckedChangeListener { _, isChecked ->
+      val portValue = portField.text.trim().toString()
+      if (isChecked && portValue == "6667") {
+        portField.setText("6697")
+      } else if (!isChecked && portValue == "6697") {
+        portField.setText("6667")
+      }
+    }
+
     return view
   }
 
diff --git a/app/src/main/res/values-de/strings_setup.xml b/app/src/main/res/values-de/strings_setup.xml
index c4818d92fccde91a454c832dd4469a51e3893a11..8cfba0bdfcf8b1b247fae7766c070b29d5e3dd1e 100644
--- a/app/src/main/res/values-de/strings_setup.xml
+++ b/app/src/main/res/values-de/strings_setup.xml
@@ -48,7 +48,7 @@
 
   <string name="label_account_name">Accountname</string>
 
-  <string name="hint_invalid_name">Accountname darf nicht leer sein</string>
+  <string name="hint_invalid_name">Name darf nicht leer sein</string>
 
   <!-- Core Authenticator Select -->
   <string name="slide_core_authenticator_select_title">Authentifizierungsbackend auswählen</string>