diff --git a/Nativebrik.podspec b/Nativebrik.podspec
index f02784d..7c19454 100644
--- a/Nativebrik.podspec
+++ b/Nativebrik.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Nativebrik'
-  s.version          = '0.6.0'
+  s.version          = '0.6.1'
   s.summary          = 'Nativebrik SDK'
   s.description      = <<-DESC
 Nativebrik SDK for iOS.
diff --git a/ios/Nativebrik/Nativebrik/data/user.swift b/ios/Nativebrik/Nativebrik/data/user.swift
index b8657b4..d7cc4b1 100644
--- a/ios/Nativebrik/Nativebrik/data/user.swift
+++ b/ios/Nativebrik/Nativebrik/data/user.swift
@@ -60,6 +60,7 @@ func nativebrikUserPropType(key: BuiltinUserProperty) -> UserPropertyType {
     }
 }
 
+private let USER_CUSTOM_PROPERTY_KEY_PREFIX = "NATIVEBRIK_CUSTOM_"
 private let USER_SEED_KEY: String = "NATIVEBRIK_USER_SEED"
 private let USER_SEED_MAX: Int = 100000000
 
@@ -114,6 +115,13 @@ public class NativebrikUser {
 
         let cfBundleVersion = Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? ""
         self.properties[BuiltinUserProperty.cfBundleVersion.rawValue] = cfBundleVersion
+        
+        self.userDB.dictionaryRepresentation().forEach { key, value in
+            if key.starts(with: USER_CUSTOM_PROPERTY_KEY_PREFIX) {
+                let propKey = key.replacingOccurrences(of: USER_CUSTOM_PROPERTY_KEY_PREFIX, with: "")
+                self.customProperties[propKey] = String(describing: value)
+            }
+        }
 
         self.comeBack()
     }
@@ -136,9 +144,11 @@ public class NativebrikUser {
             if key == BuiltinUserProperty.userId.rawValue {
                 // overwrite userId
                 self.properties[BuiltinUserProperty.userId.rawValue] = value
+                self.userDB.set(value, forKey: NativebrikUserDefaultsKeys.USER_ID.rawValue)
                 continue
             }
             self.customProperties[key] = value
+            self.userDB.set(value, forKey: USER_CUSTOM_PROPERTY_KEY_PREFIX + key)
         }
     }
 
diff --git a/ios/Nativebrik/Nativebrik/sdk.swift b/ios/Nativebrik/Nativebrik/sdk.swift
index e1c34a1..b4c5c12 100644
--- a/ios/Nativebrik/Nativebrik/sdk.swift
+++ b/ios/Nativebrik/Nativebrik/sdk.swift
@@ -12,7 +12,7 @@ import Combine
 // for development
 public var nativebrikTrackUrl = "https://track.nativebrik.com/track/v1"
 public var nativebrikCdnUrl = "https://cdn.nativebrik.com"
-public let nativebrikSdkVersion = "0.6.0"
+public let nativebrikSdkVersion = "0.6.1"
 
 public let isNativebrikAvailable: Bool = {
     if #available(iOS 15.0, *) {