diff --git a/app/src/main/java/com/p_vacho/neat_calendar/activities/LoginActivity.kt b/app/src/main/java/com/p_vacho/neat_calendar/activities/LoginActivity.kt
index ecb6fe4..1a3950f 100644
--- a/app/src/main/java/com/p_vacho/neat_calendar/activities/LoginActivity.kt
+++ b/app/src/main/java/com/p_vacho/neat_calendar/activities/LoginActivity.kt
@@ -78,10 +78,10 @@ class LoginActivity : AppCompatActivity() {
                         .show()
                 }
 
-                is LoginResult.UnknownError -> {
+                is LoginResult.BadCredentials -> {
                     Toast.makeText(
                         this@LoginActivity,
-                        getString(R.string.login_failed_please_try_again),
+                        getString(R.string.login_credentials_invalid),
                         Toast.LENGTH_LONG
                     ).show()
                 }
diff --git a/app/src/main/java/com/p_vacho/neat_calendar/activities/RegisterActivity.kt b/app/src/main/java/com/p_vacho/neat_calendar/activities/RegisterActivity.kt
index 955479f..33f4811 100644
--- a/app/src/main/java/com/p_vacho/neat_calendar/activities/RegisterActivity.kt
+++ b/app/src/main/java/com/p_vacho/neat_calendar/activities/RegisterActivity.kt
@@ -86,10 +86,6 @@ class RegisterActivity : AppCompatActivity() {
                     Toast.makeText(this@RegisterActivity,
                         getString(R.string.user_already_exists_please_log_in), Toast.LENGTH_LONG).show()
                 }
-                is RegisterResult.UnknownError -> {
-                    Toast.makeText(this@RegisterActivity,
-                        getString(R.string.registration_failed_try_again_later), Toast.LENGTH_LONG).show()
-                }
             }
         }
     }
diff --git a/app/src/main/java/com/p_vacho/neat_calendar/util/auth/AuthRepository.kt b/app/src/main/java/com/p_vacho/neat_calendar/util/auth/AuthRepository.kt
index 5cf22d5..2ee2a60 100644
--- a/app/src/main/java/com/p_vacho/neat_calendar/util/auth/AuthRepository.kt
+++ b/app/src/main/java/com/p_vacho/neat_calendar/util/auth/AuthRepository.kt
@@ -15,13 +15,12 @@ sealed class RegisterResult {
     data class Success(val response: RegisterResponse) : RegisterResult()
     data class ValidationError(val errorData: com.p_vacho.neat_calendar.api.models.ValidationError) : RegisterResult()
     data object UserAlreadyExists : RegisterResult()
-    data class UnknownError(val exception: Throwable) : RegisterResult()
 }
 
 sealed class LoginResult {
     data object Success : LoginResult()
     data class ValidationError(val errorData: com.p_vacho.neat_calendar.api.models.ValidationError) : LoginResult()
-    data class UnknownError(val exception: Throwable) : LoginResult()
+    data object BadCredentials: LoginResult()
 }
 
 
@@ -44,14 +43,15 @@ class AuthRepository(private val tokenManager: TokenManager) {
                         Log.w("API", "Validation error: $validationError")
                         LoginResult.ValidationError(validationError)
                     }
-                    else -> {
+                    401 -> {
                         Log.w("API", "Login request failed (${e.message()})", e)
-                        LoginResult.UnknownError(e)
+                        LoginResult.BadCredentials
+                    }
+                    else -> {
+                        Log.e("API", "Login request failed (${e.message()})", e)
+                        throw e
                     }
                 }
-            } catch (e: Exception) {
-                Log.e("API", "Unexpected error during login", e)
-                LoginResult.UnknownError(e)
             }
         }
     }
@@ -76,13 +76,10 @@ class AuthRepository(private val tokenManager: TokenManager) {
                         RegisterResult.UserAlreadyExists
                     }
                     else -> {
-                        Log.w("API", "Register request failed (${e.message()})", e)
-                        RegisterResult.UnknownError(e)
+                        Log.e("API", "Register request failed (${e.message()})", e)
+                        throw e
                     }
                 }
-            } catch (e: Exception) {
-                Log.e("API", "Unexpected error during registration", e)
-                RegisterResult.UnknownError(e)
             }
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 95a4a94..ed0eba5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -62,10 +62,8 @@
     <string name="user_registered_you_may_now_log_in">User registered, you may now log in</string>
     <string name="validation_errors">Validation Errors</string>
     <string name="user_already_exists_please_log_in">User already exists. Please log in.</string>
-    <string name="registration_failed_try_again_later">Registration failed. Try again later.</string>
     <string name="please_fill_in_all_fields">Please fill in all fields</string>
     <string name="ok">OK</string>
-    <string name="login_failed_please_try_again">Login failed. Please try again.</string>
     <string name="end_time_must_be_after_start_time">End time must be after start time</string>
     <string name="user_not_authenticated_unable_to_fetch_categories">User not authenticated. Unable to fetch categories.</string>
     <string name="no_more_categories_to_add">No more categories to add</string>
@@ -101,4 +99,5 @@
     <string name="please_enter_a_category_name">Please enter a category name</string>
     <string name="failed_to_save_category">Failed to save category: %1$s</string>
     <string name="instant_event_time">At: %1$s</string>
+    <string name="login_credentials_invalid">Login credentials invalid</string>
 </resources>
\ No newline at end of file