diff --git a/app/src/main/java/com/etesync/syncadapter/Constants.java b/app/src/main/java/com/etesync/syncadapter/Constants.java
index af2bf909..8dc1e370 100644
--- a/app/src/main/java/com/etesync/syncadapter/Constants.java
+++ b/app/src/main/java/com/etesync/syncadapter/Constants.java
@@ -35,6 +35,7 @@ public class Constants {
     public static final Uri forgotPassword = webUri.buildUpon().appendEncodedPath("accounts/password/reset/").build();
 
     public static final Uri serviceUrl = Uri.parse((DEBUG_REMOTE_URL == null) ? "https://api.etesync.com/" : DEBUG_REMOTE_URL);
+    public static final String etebaseServiceUrl = (DEBUG_REMOTE_URL == null) ? "https://api.etebase.com/partner/etesync/" : DEBUG_REMOTE_URL;
 
     public static final String PRODID_BASE = "-//EteSync//" + BuildConfig.APPLICATION_ID + "/" + BuildConfig.VERSION_NAME;
 
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.kt
index c9c44d04..4ece9937 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/BaseConfigurationFinder.kt
@@ -90,7 +90,7 @@ class BaseConfigurationFinder(protected val context: Context, protected val cred
     fun findInitialConfigurationEtebase(): Configuration {
         var exception: Throwable? = null
 
-        val uri = credentials.uri
+        val uri = credentials.uri ?: URI(Constants.etebaseServiceUrl)
 
         var etebaseSession: String? = null
         try {