diff --git a/auth/src/main/java/com/firebase/ui/auth/FirebaseUIComposeRegistrar.kt b/auth/src/main/java/com/firebase/ui/auth/FirebaseUIComposeRegistrar.kt
index db960df5b..c985a29af 100644
--- a/auth/src/main/java/com/firebase/ui/auth/FirebaseUIComposeRegistrar.kt
+++ b/auth/src/main/java/com/firebase/ui/auth/FirebaseUIComposeRegistrar.kt
@@ -16,7 +16,6 @@ package com.firebase.ui.auth
 
 import android.util.Log
 import androidx.annotation.Keep
-import com.firebase.ui.auth.BuildConfig
 import com.google.firebase.components.Component
 import com.google.firebase.components.ComponentRegistrar
 import com.google.firebase.platforminfo.LibraryVersionComponent
@@ -28,7 +27,9 @@ import com.google.firebase.platforminfo.LibraryVersionComponent
 @Keep
 class FirebaseUIComposeRegistrar : ComponentRegistrar {
     override fun getComponents(): List<Component<*>> {
-        Log.d("FirebaseUIRegistrar", "FirebaseUI Compose Registrar initialized")
+        Log.d("FirebaseUIRegistrar", "FirebaseUI Compose Registrar initialized: " +
+                "LIBRARY_NAME: ${BuildConfig.LIBRARY_NAME}, " +
+                "VERSION_NAME: ${BuildConfig.VERSION_NAME}")
         return listOf(
             LibraryVersionComponent.create(BuildConfig.LIBRARY_NAME, BuildConfig.VERSION_NAME)
         )
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/screens/FirebaseAuthScreen.kt b/auth/src/main/java/com/firebase/ui/auth/ui/screens/FirebaseAuthScreen.kt
index 0a0a3c045..6e9ed8492 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/screens/FirebaseAuthScreen.kt
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/screens/FirebaseAuthScreen.kt
@@ -48,6 +48,7 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.firebase.ui.auth.AuthException
 import com.firebase.ui.auth.AuthState
+import com.firebase.ui.auth.BuildConfig
 import com.firebase.ui.auth.FirebaseAuthUI
 import com.firebase.ui.auth.configuration.AuthUIConfiguration
 import com.firebase.ui.auth.configuration.MfaConfiguration
@@ -94,6 +95,11 @@ fun FirebaseAuthScreen(
     mfaConfiguration: MfaConfiguration = MfaConfiguration(),
     authenticatedContent: (@Composable (state: AuthState, uiContext: AuthSuccessUiContext) -> Unit)? = null,
 ) {
+    // Set FirebaseUI version
+    LaunchedEffect(authUI.auth) {
+        authUI.auth.setFirebaseUIVersion(BuildConfig.VERSION_NAME)
+    }
+
     val activity = LocalActivity.current
     val context = LocalContext.current
     val coroutineScope = rememberCoroutineScope()