diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
index dde22c6..bb82380 100644
--- a/android/.idea/gradle.xml
+++ b/android/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/android/.idea/vcs.xml b/android/.idea/vcs.xml
index 94a25f7..288b36b 100644
--- a/android/.idea/vcs.xml
+++ b/android/.idea/vcs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/android/app/src/main/java/net/buzzert/kordophonedroid/ui/shared/ServerConfigRepository.kt b/android/app/src/main/java/net/buzzert/kordophonedroid/ui/shared/ServerConfigRepository.kt
index 4a30883..67f01b3 100644
--- a/android/app/src/main/java/net/buzzert/kordophonedroid/ui/shared/ServerConfigRepository.kt
+++ b/android/app/src/main/java/net/buzzert/kordophonedroid/ui/shared/ServerConfigRepository.kt
@@ -24,7 +24,7 @@ data class ServerConfig(
         fun loadFromSettings(context: Context): ServerConfig {
             val prefs = getSharedPreferences(context)
             return ServerConfig(
-                serverName = prefs.getString("serverName", null),
+                serverName = prefs.getString("serverName", null).normalizedBaseUrl(),
                 authentication = ServerAuthentication.loadFromEncryptedSettings(context)
             )
         }
@@ -37,7 +37,7 @@ data class ServerConfig(
     fun saveToSettings(context: Context) {
         val prefs = getSharedPreferences(context)
         prefs.edit {
-            putString("serverName", serverName)
+            putString("serverName", serverName.normalizedBaseUrl())
             apply()
         }
 
@@ -45,6 +45,11 @@ data class ServerConfig(
     }
 }
 
+fun String?.normalizedBaseUrl(): String? {
+    val value = this?.trim()?.takeIf { it.isNotEmpty() } ?: return null
+    return if (value.endsWith("/")) value else "$value/"
+}
+
 data class ServerAuthentication(
     val username: String,
     val password: String,
@@ -101,7 +106,9 @@ class ServerConfigRepository @Inject constructor(
 
     fun applyConfig(applicator: ServerConfig.() -> Unit) {
         val config = _serverConfig.value.copy()
-        _serverConfig.value = config.apply(applicator)
+        _serverConfig.value = config.apply(applicator).also {
+            it.serverName = it.serverName.normalizedBaseUrl()
+        }
         _serverConfig.value.saveToSettings(context)
     }
 }
diff --git a/android/backend/src/main/java/net/buzzert/kordophone/backend/server/APIClient.kt b/android/backend/src/main/java/net/buzzert/kordophone/backend/server/APIClient.kt
index d291493..2632f34 100644
--- a/android/backend/src/main/java/net/buzzert/kordophone/backend/server/APIClient.kt
+++ b/android/backend/src/main/java/net/buzzert/kordophone/backend/server/APIClient.kt
@@ -104,8 +104,10 @@ class APIClientFactory {
                 return InvalidConfigurationAPIClient(InvalidConfigurationAPIClient.Issue.NOT_CONFIGURED)
             }
 
+            val normalizedServerString = serverString.ensureTrailingSlash()
+
             // Try to parse server string
-            val serverURL = HttpUrl.parse(serverString)
+            val serverURL = HttpUrl.parse(normalizedServerString)
                 ?: return InvalidConfigurationAPIClient(InvalidConfigurationAPIClient.Issue.INVALID_HOST_URL)
 
             return RetrofitAPIClient(serverURL.url(), authentication)
@@ -113,6 +115,10 @@ class APIClientFactory {
     }
 }
 
+private fun String.ensureTrailingSlash(): String {
+    return if (endsWith("/")) this else "$this/"
+}
+
 // TODO: Is this a dumb idea?
 class InvalidConfigurationAPIClient(val issue: Issue): APIClient {
     enum class Issue {
@@ -215,4 +221,4 @@ fun URL.authenticatedWebSocketURL(serverPath: String, params: Map<String, String
     }
 
     return URL(requestURL.build().toString())
-}
\ No newline at end of file
+}
diff --git a/android/backend/src/test/java/net/buzzert/kordophone/backend/BackendTests.kt b/android/backend/src/test/java/net/buzzert/kordophone/backend/BackendTests.kt
index d4cb2cb..a0c80ec 100644
--- a/android/backend/src/test/java/net/buzzert/kordophone/backend/BackendTests.kt
+++ b/android/backend/src/test/java/net/buzzert/kordophone/backend/BackendTests.kt
@@ -11,6 +11,7 @@ import net.buzzert.kordophone.backend.db.CachedChatDatabase
 import net.buzzert.kordophone.backend.model.Message
 import net.buzzert.kordophone.backend.model.OutgoingMessage
 import net.buzzert.kordophone.backend.server.APIClient
+import net.buzzert.kordophone.backend.server.APIClientFactory
 import net.buzzert.kordophone.backend.server.APIInterface
 import net.buzzert.kordophone.backend.server.Authentication
 import net.buzzert.kordophone.backend.server.ChatRepository
@@ -38,6 +39,16 @@ class BackendTests {
         return Pair(repository, mockServer)
     }
 
+    @Test
+    fun testCreateClientAcceptsBaseUrlWithoutTrailingSlash() {
+        val client = APIClientFactory.createClient(
+            "https://example.com/api",
+            Authentication("test", "test")
+        )
+
+        assertTrue(client.isConfigured)
+    }
+
     @Test
     fun testGetVersion() = runBlocking {
         val (repository, mockServer) = mockRepository()
@@ -342,4 +353,4 @@ class BackendTests {
             assertEquals(messagesToGenerate, allMessages.count())
         }
     }
-}
\ No newline at end of file
+}