diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
index 36245329f..af197a222 100644
--- a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
+++ b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
@@ -224,7 +224,9 @@ class MeetingStore extends ChangeNotifier
     if (roomConfig == null) {
       //We use this to get the auth token from room code
       dynamic tokenData = await _hmsSDKInteractor.getAuthTokenByRoomCode(
-          roomCode: Constant.roomCode, endPoint: Constant.tokenEndPoint);
+          userId: Constant.prebuiltOptions?.userId,
+          roomCode: Constant.roomCode,
+          endPoint: Constant.tokenEndPoint);
 
       ///If the tokenData is String then we set the authToken in the roomConfig
       ///and then we join the room
diff --git a/packages/hms_room_kit/lib/src/preview/preview_page.dart b/packages/hms_room_kit/lib/src/preview/preview_page.dart
index 49c4f3b20..45ec46858 100644
--- a/packages/hms_room_kit/lib/src/preview/preview_page.dart
+++ b/packages/hms_room_kit/lib/src/preview/preview_page.dart
@@ -41,13 +41,14 @@ class PreviewPage extends StatefulWidget {
 
 class _PreviewPageState extends State<PreviewPage> {
   late MeetingStore _meetingStore;
-  TextEditingController nameController = TextEditingController();
+  late TextEditingController nameController;
   bool isJoiningRoom = false;
   bool isHLSStarting = false;
 
   @override
   void initState() {
     super.initState();
+    nameController = TextEditingController(text: widget.name);
   }
 
   @override
diff --git a/packages/hms_room_kit/lib/src/preview/preview_store.dart b/packages/hms_room_kit/lib/src/preview/preview_store.dart
index 7a38dd8ea..00e36275c 100644
--- a/packages/hms_room_kit/lib/src/preview/preview_store.dart
+++ b/packages/hms_room_kit/lib/src/preview/preview_store.dart
@@ -111,7 +111,9 @@ class PreviewStore extends ChangeNotifier
       {required String userName, required String roomCode}) async {
     //We use this to get the auth token from room code
     dynamic tokenData = await hmsSDKInteractor.getAuthTokenByRoomCode(
-        roomCode: roomCode, endPoint: Constant.tokenEndPoint);
+        userId: Constant.prebuiltOptions?.userId,
+        roomCode: roomCode,
+        endPoint: Constant.tokenEndPoint);
 
     if ((tokenData is String?) && tokenData != null) {
       roomConfig = HMSConfig(
diff --git a/packages/hms_room_kit/lib/src/screen_controller.dart b/packages/hms_room_kit/lib/src/screen_controller.dart
index 83853aeae..9f6bbb4ad 100644
--- a/packages/hms_room_kit/lib/src/screen_controller.dart
+++ b/packages/hms_room_kit/lib/src/screen_controller.dart
@@ -110,7 +110,7 @@ class _ScreenControllerState extends State<ScreenController> {
     await _hmsSDKInteractor.build();
     _previewStore = PreviewStore(hmsSDKInteractor: _hmsSDKInteractor);
     HMSException? ans = await _previewStore.startPreview(
-        userName: "", roomCode: Constant.roomCode);
+        userName: widget.options?.userName??"", roomCode: Constant.roomCode);
 
     ///If preview fails then we show the error dialog
     ///with the error message and description
@@ -156,7 +156,7 @@ class _ScreenControllerState extends State<ScreenController> {
                   value: _previewStore,
                   child: PreviewPage(
                     roomCode: Constant.roomCode,
-                    name: "",
+                    name: widget.options?.userName??"",
                     options: widget.options,
                   ))
               : PreviewPermissions(
diff --git a/packages/hmssdk_flutter/example/android/app/build.gradle b/packages/hmssdk_flutter/example/android/app/build.gradle
index 1e7216cca..49e36063c 100644
--- a/packages/hmssdk_flutter/example/android/app/build.gradle
+++ b/packages/hmssdk_flutter/example/android/app/build.gradle
@@ -32,8 +32,8 @@ android {
         applicationId "live.hms.flutter"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 361
-        versionName "1.5.61"
+        versionCode 362
+        versionName "1.5.62"
     }
 
     signingConfigs {
diff --git a/packages/hmssdk_flutter/example/ios/Runner/Info.plist b/packages/hmssdk_flutter/example/ios/Runner/Info.plist
index 304eaacf5..bc0e9d7b1 100644
--- a/packages/hmssdk_flutter/example/ios/Runner/Info.plist
+++ b/packages/hmssdk_flutter/example/ios/Runner/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.62</string>
+	<string>1.5.63</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -48,7 +48,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>362</string>
+	<string>363</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/packages/hmssdk_flutter/example/lib/main.dart b/packages/hmssdk_flutter/example/lib/main.dart
index 7c237aa56..cc7a5473c 100644
--- a/packages/hmssdk_flutter/example/lib/main.dart
+++ b/packages/hmssdk_flutter/example/lib/main.dart
@@ -309,6 +309,7 @@ class _HomePageState extends State<HomePage> {
                 roomCode: Constant.roomCode,
                 options: HMSPrebuiltOptions(
                     endPoints: endPoints,
+                    userId: "user_flutter", // pass your custom unique user identifier here
                     iOSScreenshareConfig: HMSIOSScreenshareConfig(
                         appGroup: "group.flutterhms",
                         preferredExtension: