diff --git a/.idea/misc.xml b/.idea/misc.xml
index 773fe0f..4412b1a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17_PREVIEW" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
index 9c4cf05..656f30a 100644
--- a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
@@ -495,11 +495,10 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
             binding.email.setFocusable(false);
             binding.emailTitle.setText(getString(R.string.email_address));
 
+            binding.caregiverCheckView.setVisibility(View.VISIBLE);
             binding.caregiverCheck.setChecked(true);
             binding.caregiverCheck.setEnabled(false);
             binding.relationship.setEnabled(false);
-        } else {
-            binding.caregiverCheckView.setVisibility(View.GONE);
         }
 
         // checking if this contact is doctor
@@ -605,7 +604,7 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
         contact_binding.defaultCheck.setSelected(id_default);
 
         // if contact is a doctor we wont allow the contact to be changes
-        if (contactData.is_doctor != null && contactData.is_doctor.equals("1")){
+        if (contactData != null && contactData.is_doctor != null && contactData.is_doctor.equals("1")){
             contact_binding.createPhoneNumber.setEnabled(false);
             contact_binding.createCountryCodes.setEnabled(false);
             contact_binding.defaultCheck.setEnabled(false);
diff --git a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/register/SplashFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/register/SplashFragment.java
index 729b03d..981ac17 100644
--- a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/register/SplashFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/register/SplashFragment.java
@@ -269,14 +269,14 @@ public class SplashFragment extends Fragment
         // caching data
         PatientDataCache.setPatientData(patientData);
 
-        if (!patientData.caregiver_status.equals(AccountPresenter.ACC_ACTIVE_STR)){
-            // account is not active
-
-            gotoReActivateScreen(patientData.caregiver_status,
-                    AppUtil.getPatientToken(requireContext()),
-                    -1, false);
-            return;
-        }
+//        if (!patientData.caregiver_status.equals(AccountPresenter.ACC_ACTIVE_STR)){
+//            // account is not active
+//
+//            gotoReActivateScreen(patientData.caregiver_status,
+//                    AppUtil.getPatientToken(requireContext()),
+//                    -1, false);
+//            return;
+//        }
 
         binding.retry.setVisibility(View.GONE);
         binding.loadAnim.setVisibility(View.GONE);
diff --git a/app/src/main/res/layout/create_edit_contact_fragment.xml b/app/src/main/res/layout/create_edit_contact_fragment.xml
index dc43601..867b766 100644
--- a/app/src/main/res/layout/create_edit_contact_fragment.xml
+++ b/app/src/main/res/layout/create_edit_contact_fragment.xml
@@ -317,6 +317,7 @@
 
         <LinearLayout
             android:id="@+id/caregiver_check_view"
+            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"