diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index 77186b0b..d09d33f4 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -47,7 +47,7 @@ const Map<String, Map<String, String>> localizedValues = {
   'radiology': {'en': 'Radiology', 'ar': 'الأشعة'},
   'service': {'en': 'Service', 'ar': 'خدمة'},
   'referral': {'en': 'Referral', 'ar': 'الإحالة'},
-  'inPatient': {'en': 'My\n InPatients', 'ar': 'مرضاي'},
+  'inPatient': {'en': 'InPatients', 'ar': 'مرضاي'},
   'inPatientLabel': {'en': 'InPatients', 'ar': 'المريض الداخلي'},
   'inPatientAll': {'en': 'All InPatients', 'ar': 'كل المرضى'},
   'operations': {'en': 'Operations', 'ar': 'عمليات'},
diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart
index 76dba1cf..79ceddbf 100644
--- a/lib/screens/home/home_screen.dart
+++ b/lib/screens/home/home_screen.dart
@@ -503,8 +503,7 @@ class _HomeScreenState extends State<HomeScreen> {
                                           Container(
                                               padding: EdgeInsets.all(10),
                                               child: AppText(
-                                                TranslationBase.of(context)
-                                                    .inPatient,
+                                                "My\n"+TranslationBase.of(context).inPatient,
                                                 color: Colors.white,
                                                 textAlign: TextAlign.start,
                                                 fontSize: 15,
diff --git a/lib/screens/patients/PatientsInPatientScreen.dart b/lib/screens/patients/PatientsInPatientScreen.dart
index 75b65847..e6c28a51 100644
--- a/lib/screens/patients/PatientsInPatientScreen.dart
+++ b/lib/screens/patients/PatientsInPatientScreen.dart
@@ -107,7 +107,7 @@ class _PatientInPatientScreenState extends State<PatientInPatientScreen> with Si
                         unselectedLabelColor: Colors.grey[800],
                         tabs: [
                           tabWidget(screenSize, _activeTab == 0, TranslationBase.of(context).inPatientAll, counter: model.inPatientList.length),
-                          tabWidget(screenSize, _activeTab == 1, TranslationBase.of(context).inPatient, counter: model.myIinPatientList.length),
+                          tabWidget(screenSize, _activeTab == 1, "My InPatients", counter: model.myIinPatientList.length),
                           tabWidget(screenSize, _activeTab == 2, TranslationBase.of(context).discharged),
                         ],
                       ),
diff --git a/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart b/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
index 3d7638c2..d5c43892 100644
--- a/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
+++ b/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
@@ -303,7 +303,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget
                                   "${TranslationBase.of(context).numOfDays}: ",
                                   fontSize: 15,
                                 ),
-                                if(isDischargedPatient)
+                                if(isDischargedPatient && patient.dischargeDate!=null)
                                 AppText(
                                     "${DateUtils.getDateTimeFromServerFormat(patient.dischargeDate).difference(DateUtils.getDateTimeFromServerFormat(patient.admissionDate)).inDays + 1}",
                                     fontSize: 15,