diff --git a/public/networking/src/main/java/com/smileidentity/networking/SmileIdentity.kt b/public/networking/src/main/java/com/smileidentity/networking/SmileIdentity.kt
index dfafd032f..552106443 100644
--- a/public/networking/src/main/java/com/smileidentity/networking/SmileIdentity.kt
+++ b/public/networking/src/main/java/com/smileidentity/networking/SmileIdentity.kt
@@ -16,7 +16,7 @@ object SmileIdentity {
     @JvmStatic
     lateinit var api: SmileIdentityService private set
     val moshi: Moshi = initMoshi()
-    internal lateinit var config: Config private set
+    lateinit var config: Config private set
     private lateinit var retrofit: Retrofit
 
     // Can't use lateinit on primitives, this default will be overwritten as soon as init is called
diff --git a/ui/src/main/java/com/smileidentity/ui/core/SmileIdentityCrashReporting.kt b/ui/src/main/java/com/smileidentity/ui/core/SmileIdentityCrashReporting.kt
index 4d154a4a2..7d64a9204 100644
--- a/ui/src/main/java/com/smileidentity/ui/core/SmileIdentityCrashReporting.kt
+++ b/ui/src/main/java/com/smileidentity/ui/core/SmileIdentityCrashReporting.kt
@@ -45,16 +45,16 @@ object SmileIdentityCrashReporting {
         }
 
         hub = Hub(options).apply {
-            setTag("sdk_version", BuildConfig.VERSION_NAME)
+            setTag("brand", Build.BRAND)
             setTag("build_type", BuildConfig.BUILD_TYPE) // Distinguish between debug and release
-            setTag("os_version", Build.VERSION.RELEASE)
-            setTag("os_api_level", Build.VERSION.SDK_INT.toString())
             setTag("cpu_abi", Build.SUPPORTED_ABIS?.first() ?: "unknown")
-            setTag("product", Build.PRODUCT)
-            setTag("manufacturer", Build.MANUFACTURER)
-            setTag("brand", Build.BRAND)
             setTag("device", Build.DEVICE)
+            setTag("manufacturer", Build.MANUFACTURER)
             setTag("model", Build.MODEL)
+            setTag("os_api_level", Build.VERSION.SDK_INT.toString())
+            setTag("os_version", Build.VERSION.RELEASE)
+            setTag("product", Build.PRODUCT)
+            setTag("sdk_version", BuildConfig.VERSION_NAME)
         }
 
         // Once this UncaughtExceptionHandler handles the exception, it will pass the exception on
diff --git a/ui/src/main/java/com/smileidentity/ui/core/SmileIdentityExt.kt b/ui/src/main/java/com/smileidentity/ui/core/SmileIdentityExt.kt
index a3c8232cd..373454d67 100644
--- a/ui/src/main/java/com/smileidentity/ui/core/SmileIdentityExt.kt
+++ b/ui/src/main/java/com/smileidentity/ui/core/SmileIdentityExt.kt
@@ -30,4 +30,8 @@ fun SmileIdentity.init(
         useSandbox = useSandbox,
         okHttpClient = okHttpClient,
     )
+    // enabled after init to allow partner_id to be fetched from lateinit config.
+    if (enableCrashReporting) {
+        SmileIdentityCrashReporting.hub.setTag("partner_id", config.partnerId)
+    }
 }