diff --git a/lib/classes/consts.dart b/lib/classes/consts.dart
index 646e498..c5788f9 100644
--- a/lib/classes/consts.dart
+++ b/lib/classes/consts.dart
@@ -1,7 +1,7 @@
 class ApiConsts {
   //static String baseUrl = "http://10.200.204.20:2801/"; // Local server
-  static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
-  // static String baseUrl = "https://hmgwebservices.com"; // Live server
+  //static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
+  static String baseUrl = "https://hmgwebservices.com"; // Live server
   static String baseUrlServices = baseUrl + "/Services/"; // server
   // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server
   static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/";
diff --git a/lib/ui/chat/chat_home_screen.dart b/lib/ui/chat/chat_home_screen.dart
index f10cc26..b4483dc 100644
--- a/lib/ui/chat/chat_home_screen.dart
+++ b/lib/ui/chat/chat_home_screen.dart
@@ -117,7 +117,7 @@ class _ChatHomeScreenState extends State<ChatHomeScreen> {
                                   )
                                 ],
                               ),
-                              title: (m.searchedChats![index].userName ?? "").toText14(color: MyColors.darkTextColor),
+                              title: (m.searchedChats![index].userName!.replaceFirst(".", " ").capitalizeFirstofEach ?? "").toText14(color: MyColors.darkTextColor),
                               // subtitle: (m.searchedChats![index].isTyping == true ? "Typing ..." : "").toText11(color: MyColors.normalTextColor),
                               trailing: SizedBox(
                                 width: 60,
diff --git a/lib/ui/chat/favorite_users_screen.dart b/lib/ui/chat/favorite_users_screen.dart
index a41c1b8..8b5eba0 100644
--- a/lib/ui/chat/favorite_users_screen.dart
+++ b/lib/ui/chat/favorite_users_screen.dart
@@ -56,7 +56,7 @@ class ChatFavoriteUsersScreen extends StatelessWidget {
                               )
                             ],
                           ),
-                          title: (m.favUsersList![index].userName ?? "").toText14(color: MyColors.darkTextColor),
+                          title: (m.searchedChats![index].userName!.replaceFirst(".", " ").capitalizeFirstofEach ?? "").toText14(color: MyColors.darkTextColor),
                           trailing: IconButton(
                             alignment: Alignment.centerRight,
                             padding: EdgeInsets.zero,