diff --git a/Runtime/Code/SDK/GuruSDK.Properties.cs b/Runtime/Code/SDK/GuruSDK.Properties.cs
index 1e2f07b..3d04253 100644
--- a/Runtime/Code/SDK/GuruSDK.Properties.cs
+++ b/Runtime/Code/SDK/GuruSDK.Properties.cs
@@ -2,9 +2,17 @@ namespace Guru
 {
     public partial class GuruSDK
     {
-        
-        public static string UID => Model?.UserId ?? IPMConfig.IPM_UID;
-        public static string UUID => Model?.UserId ?? IPMConfig.IPM_UUID;
+        // UID
+        public static string UID
+        {
+            get
+            {
+                if(Model != null && !string.IsNullOrEmpty(Model.UserId)) 
+                    return Model.UserId;
+                return IPMConfig.IPM_UID;
+            }
+        }
+        public static string UUID => IPMConfig.IPM_UUID ?? "";
         public static string DeviceId => IPMConfig.IPM_DEVICE_ID ?? "";  // TODO: change it to _model member later.
         public static string PushToken => IPMConfig.IPM_PUSH_TOKEN ?? ""; // TODO: change it to _model member later.
         public static string AuthToken => IPMConfig.IPM_TOKEN ?? ""; // TODO: change it to _model member later.
diff --git a/Runtime/Code/SDK/GuruSDK.cs b/Runtime/Code/SDK/GuruSDK.cs
index 50b6cba..bb4f9e4 100644
--- a/Runtime/Code/SDK/GuruSDK.cs
+++ b/Runtime/Code/SDK/GuruSDK.cs
@@ -178,6 +178,7 @@ namespace Guru
 
         private void OnUserAuthResult(bool success)
         {
+            
             if (success && string.IsNullOrEmpty(IPMConfig.IPM_UID))
             {
                 success = false;
@@ -186,6 +187,7 @@ namespace Guru
 
             if (success)
             {
+                Model.UserId = IPMConfig.IPM_UID;
                 if (GuruIAP.Instance != null)
                 {
                     GuruIAP.Instance.SetUID(UID);