diff --git a/app/src/main/java/com/example/theloop/OnboardingViewModel.kt b/app/src/main/java/com/example/theloop/OnboardingViewModel.kt
index cc63d54..165bae3 100644
--- a/app/src/main/java/com/example/theloop/OnboardingViewModel.kt
+++ b/app/src/main/java/com/example/theloop/OnboardingViewModel.kt
@@ -22,10 +22,14 @@ class OnboardingViewModel @Inject constructor(
         _name.value = newName
     }
 
-    fun saveName() {
-        viewModelScope.launch {
-            userPreferencesRepository.saveUserName(name.value)
+    fun saveName(): Boolean {
+        val isNameValid = name.value.isNotBlank()
+        if (isNameValid) {
+            viewModelScope.launch {
+                userPreferencesRepository.saveUserName(name.value)
+            }
         }
+        return isNameValid
     }
 
     fun completeOnboarding() {
diff --git a/app/src/main/java/com/example/theloop/ui/screens/OnboardingScreen.kt b/app/src/main/java/com/example/theloop/ui/screens/OnboardingScreen.kt
index 7103a82..37457cb 100644
--- a/app/src/main/java/com/example/theloop/ui/screens/OnboardingScreen.kt
+++ b/app/src/main/java/com/example/theloop/ui/screens/OnboardingScreen.kt
@@ -98,8 +98,9 @@ fun OnboardingScreen(
                     Button(onClick = {
                         if (currentStep == 0) {
                             // Save Name
-                            if (name.isNotEmpty()) {
-                                viewModel.saveName()
+                            if (!viewModel.saveName()) {
+                                Toast.makeText(context, "Name cannot be blank", Toast.LENGTH_SHORT).show()
+                                return@Button
                             }
                         }