diff --git a/lib/main.dart b/lib/main.dart
index 9753f64..b00609b 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -6,6 +6,7 @@ import 'package:flutter/services.dart';
 import 'package:logger/logger.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/consts.dart';
+import 'package:mohem_flutter_app/config/env.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/generated/codegen_loader.g.dart';
 import 'package:mohem_flutter_app/models/post_params_model.dart';
@@ -62,12 +63,14 @@ Future<void> main() async {
           ChangeNotifierProvider<EITProviderModel>(
             create: (_) => EITProviderModel(),
           ),
-          ChangeNotifierProvider<ChatProviderModel>(
-            create: (_) => ChatProviderModel(),
-          ),
-          ChangeNotifierProvider<MarathonProvider>(
-            create: (_) => MarathonProvider(),
-          ),
+          if (env.chat)
+            ChangeNotifierProvider<ChatProviderModel>(
+              create: (_) => ChatProviderModel(),
+            ),
+          if (env.marathon)
+            ChangeNotifierProvider<MarathonProvider>(
+              create: (_) => MarathonProvider(),
+            ),
           // ChangeNotifierProvider<ChatCallProvider>(
           //   create: (_) => ChatCallProvider(),
           // ),
diff --git a/lib/ui/landing/widget/app_drawer.dart b/lib/ui/landing/widget/app_drawer.dart
index eac55e5..2b8e034 100644
--- a/lib/ui/landing/widget/app_drawer.dart
+++ b/lib/ui/landing/widget/app_drawer.dart
@@ -5,6 +5,7 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
 import 'package:mohem_flutter_app/classes/utils.dart';
+import 'package:mohem_flutter_app/config/env.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
@@ -29,12 +30,14 @@ class AppDrawer extends StatefulWidget {
 
 class _AppDrawerState extends State<AppDrawer> {
   List<DrawerMenuItem> drawerMenuItemList = [];
-  late ChatProviderModel chatData;
+  ChatProviderModel? chatData;
 
   @override
   void initState() {
     super.initState();
-    chatData = Provider.of<ChatProviderModel>(context, listen: false);
+    if (env.chat) {
+      chatData = Provider.of<ChatProviderModel>(context, listen: false);
+    }
   }
 
   @override
@@ -176,7 +179,7 @@ class _AppDrawerState extends State<AppDrawer> {
     AppState().isAuthenticated = false;
     AppState().isLogged = false;
     AppState().setPostParamsInitConfig();
-    chatData.disposeData();
+    chatData?.disposeData();
     // SharedPreferences prefs = await SharedPreferences.getInstance();
     // await prefs.clear();
     Navigator.pushNamedAndRemoveUntil(context, AppRoutes.login, (Route<dynamic> route) => false, arguments: null);
diff --git a/lib/ui/login/login_screen.dart b/lib/ui/login/login_screen.dart
index 416784c..b700cff 100644
--- a/lib/ui/login/login_screen.dart
+++ b/lib/ui/login/login_screen.dart
@@ -171,7 +171,7 @@ class _LoginScreenState extends State<LoginScreen> {
     if (isAppOpenBySystem == null) {
       isAppOpenBySystem = (ModalRoute.of(context)!.settings.arguments ?? true) as bool;
       if (!kReleaseMode) {
-        username.text = "1100313582"; // Tamer User
+        username.text = "1100313582";
         password.text = "moe123456";
 
         //     1) Normal user :