diff --git a/app/src/main/java/com/example/dcav2gui/MainActivity.java b/app/src/main/java/com/example/dcav2gui/MainActivity.java
index b76fdf7..44cdbb1 100644
--- a/app/src/main/java/com/example/dcav2gui/MainActivity.java
+++ b/app/src/main/java/com/example/dcav2gui/MainActivity.java
@@ -2,6 +2,7 @@ package com.example.dcav2gui;//package com.example.dcav2gui;
 
 import android.view.MenuItem;
 
+import androidx.lifecycle.ViewModelProvider;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;//
 import android.os.Bundle;
@@ -9,6 +10,8 @@ import android.view.View;
 import android.view.Menu;
 import android.widget.Toast;
 
+import com.example.dcav2gui.ui.settings.SettingsData;
+import com.example.dcav2gui.ui.settings.SettingsViewModel;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.navigation.NavigationView;
 
@@ -25,6 +28,7 @@ public class MainActivity extends AppCompatActivity {
 
     private AppBarConfiguration mAppBarConfiguration;
     private ActivityMainBinding binding;
+    private static SettingsData globalSettings;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -60,11 +64,25 @@ public class MainActivity extends AppCompatActivity {
         NavigationUI.setupActionBarWithNavController(this, navController, mAppBarConfiguration);
         NavigationUI.setupWithNavController(navigationView, navController);
 
+
         // Check for settings file
-        if (!isSettingsFileExists()) {
+//        if (!isSettingsFileExists()) {
+//            Toast.makeText(this, "Please enter your credentials in the settings menu", Toast.LENGTH_LONG).show();
+//        }
+
+        // Load settings
+        SettingsViewModel settingsViewModel = new ViewModelProvider(this).get(SettingsViewModel.class);
+        globalSettings = settingsViewModel.loadSettings(this);
+
+        if (globalSettings==null) {
             Toast.makeText(this, "Please enter your credentials in the settings menu", Toast.LENGTH_LONG).show();
         }
 
+
+    }
+
+    public static SettingsData getGlobalSettings() {
+        return globalSettings;
     }
 
     @Override
diff --git a/app/src/main/java/com/example/dcav2gui/ui/settings/SettingsFragment.java b/app/src/main/java/com/example/dcav2gui/ui/settings/SettingsFragment.java
index 40a7520..5e8cf1d 100644
--- a/app/src/main/java/com/example/dcav2gui/ui/settings/SettingsFragment.java
+++ b/app/src/main/java/com/example/dcav2gui/ui/settings/SettingsFragment.java
@@ -14,6 +14,7 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 
+import com.example.dcav2gui.MainActivity;
 import com.example.dcav2gui.R;
 
 public class SettingsFragment extends Fragment {
@@ -39,7 +40,8 @@ public class SettingsFragment extends Fragment {
         Button buttonSaveSettings = root.findViewById(R.id.buttonSaveSettings);
 
         //Load settings if settings.json exists
-        SettingsData settingsData = settingsViewModel.loadSettings(getContext());
+        //SettingsData settingsData = settingsViewModel.loadSettings(getContext());
+        SettingsData settingsData = MainActivity.getGlobalSettings();
 
         if (settingsData != null) {
             editProfileName.setText(settingsData.profileName);