diff --git a/.configure b/.configure
index 626e2924..9d88eb2d 100644
--- a/.configure
+++ b/.configure
@@ -1,7 +1,7 @@
 {
   "project_name": "Gravatar-Android",
   "branch": "trunk",
-  "pinned_hash": "3c8238c6aa7b0098bd4ccf24e0a7b6178e3ee2a7",
+  "pinned_hash": "ef6f012d234d67a5d9bca642ede2c37be9436ff2",
   "files_to_copy": [
     {
       "file": "android/Gravatar-Android/secrets.properties",
diff --git a/.configure-files/secrets.properties.enc b/.configure-files/secrets.properties.enc
index 0b858af6..28aff7ae 100644
Binary files a/.configure-files/secrets.properties.enc and b/.configure-files/secrets.properties.enc differ
diff --git a/loginUi/build.gradle.kts b/loginUi/build.gradle.kts
index 41748bfc..98b74344 100644
--- a/loginUi/build.gradle.kts
+++ b/loginUi/build.gradle.kts
@@ -1,3 +1,4 @@
+import java.net.URI
 import java.util.Properties
 
 plugins {
@@ -31,10 +32,11 @@ android {
                 "OAUTH_CLIENT_SECRET",
                 "\"${properties["oauth.clientSecret"]?.toString() ?: ""}\"",
             )
-            manifestPlaceholders["OAUTH_REDIRECT_URI_HOST"] =
-                properties["oauth.redirectUri"]?.toString()?.split("://")?.get(1) ?: ""
-            manifestPlaceholders["OAUTH_REDIRECT_URI_SCHEME"] =
-                properties["oauth.redirectUri"]?.toString()?.split("://")?.first() ?: ""
+
+            val redirectUri = properties["oauth.redirectUri"]?.let { URI(it.toString()) }
+            manifestPlaceholders["OAUTH_REDIRECT_URI_PATH"] = redirectUri?.path.orEmpty()
+            manifestPlaceholders["OAUTH_REDIRECT_URI_HOST"] = redirectUri?.host.orEmpty()
+            manifestPlaceholders["OAUTH_REDIRECT_URI_SCHEME"] = redirectUri?.scheme.orEmpty()
         }
     }
 }
diff --git a/loginUi/src/main/AndroidManifest.xml b/loginUi/src/main/AndroidManifest.xml
index 4be7ab86..80656c10 100644
--- a/loginUi/src/main/AndroidManifest.xml
+++ b/loginUi/src/main/AndroidManifest.xml
@@ -7,13 +7,14 @@
             android:launchMode="singleTask"
             android:theme="@style/GravatarOAuth">
 
-            <intent-filter>
+            <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
+                    android:path="${OAUTH_REDIRECT_URI_PATH}"
                     android:host="${OAUTH_REDIRECT_URI_HOST}"
                     android:scheme="${OAUTH_REDIRECT_URI_SCHEME}" />
             </intent-filter>