diff --git a/app/src/main/java/foundation/e/accountmanager/ui/setup/DavResourceFinder.kt b/app/src/main/java/foundation/e/accountmanager/ui/setup/DavResourceFinder.kt
index 3f087fdc15803b2d52f197d14e24a7a619a20679..d165bdf0c31601b94d46efaa91d584ba7bf8d49b 100644
--- a/app/src/main/java/foundation/e/accountmanager/ui/setup/DavResourceFinder.kt
+++ b/app/src/main/java/foundation/e/accountmanager/ui/setup/DavResourceFinder.kt
@@ -169,6 +169,7 @@ class DavResourceFinder(
                             try {
                                 val uri = URI(href)
                                 if (uri.scheme.equals("mailto", true))
+                                    log.info("myenail: ${uri.schemeSpecificPart}")
                                     config.email = uri.schemeSpecificPart
                             } catch(e: URISyntaxException) {
                                 log.log(Level.WARNING, "Couldn't parse user address", e)
@@ -205,7 +206,7 @@ class DavResourceFinder(
                     }
                 }
                 Service.CALDAV -> {
-                    davBase.propfind(0,
+                    davBase.propfind(1,
                             ResourceType.NAME, DisplayName.NAME, CalendarColor.NAME, CalendarDescription.NAME, CalendarTimezone.NAME, CurrentUserPrivilegeSet.NAME, SupportedCalendarComponentSet.NAME,
                             CalendarHomeSet.NAME,
                             CurrentUserPrincipal.NAME
diff --git a/app/src/main/java/foundation/e/accountmanager/ui/setup/GoogleAuthenticatorFragment.kt b/app/src/main/java/foundation/e/accountmanager/ui/setup/GoogleAuthenticatorFragment.kt
index ee04b8ea90d9e11f278de8262efc475759ea905f..9dc4028e7773836d5f4b0f8f5812dea6c5f04b17 100644
--- a/app/src/main/java/foundation/e/accountmanager/ui/setup/GoogleAuthenticatorFragment.kt
+++ b/app/src/main/java/foundation/e/accountmanager/ui/setup/GoogleAuthenticatorFragment.kt
@@ -348,10 +348,10 @@ class GoogleAuthenticatorFragment : Fragment(), AuthorizationService.TokenRespon
     }
 
     private fun validateLoginData(emailAddress: String, authState: AuthState): LoginInfo? {
-        val baseUrl = Uri.parse("https://apidata.googleusercontent.com/caldav/v2/$emailAddress/events")
-        val uri = validateBaseUrl(baseUrl, false, { message ->
+        val baseUrl = Uri.parse("https://apidata.googleusercontent.com/caldav/v2/$emailAddress/user")
+        val uri = validateBaseUrl(baseUrl, false) { message ->
             view!!.urlpwd_base_url.error = message
-        })
+        }
 
         return if (uri != null)
             LoginInfo(uri, emailAddress, null, authState, null)