diff --git a/buildSrc/build/kotlin/compileKotlin/build-history.bin b/buildSrc/build/kotlin/compileKotlin/build-history.bin
index 504ddc3..2e56a75 100644
Binary files a/buildSrc/build/kotlin/compileKotlin/build-history.bin and b/buildSrc/build/kotlin/compileKotlin/build-history.bin differ
diff --git a/buildSrc/build/kotlin/compileKotlin/last-build.bin b/buildSrc/build/kotlin/compileKotlin/last-build.bin
index de5d81f..be1c191 100644
Binary files a/buildSrc/build/kotlin/compileKotlin/last-build.bin and b/buildSrc/build/kotlin/compileKotlin/last-build.bin differ
diff --git a/buildSrc/build/libs/buildSrc.jar b/buildSrc/build/libs/buildSrc.jar
index cbf95cb..5f2654c 100644
Binary files a/buildSrc/build/libs/buildSrc.jar and b/buildSrc/build/libs/buildSrc.jar differ
diff --git a/feature/login/src/main/java/com/moneybox/minimb/feature/login/data/LoginDataSource.kt b/feature/login/src/main/java/com/moneybox/minimb/feature/login/data/LoginDataSource.kt
index c5535c4..25c2e9c 100644
--- a/feature/login/src/main/java/com/moneybox/minimb/feature/login/data/LoginDataSource.kt
+++ b/feature/login/src/main/java/com/moneybox/minimb/feature/login/data/LoginDataSource.kt
@@ -25,6 +25,8 @@ class LoginDataSource @Inject constructor(private val service : LoginDataService
                 errorResponseRemote?.let {
                     it.message?.let { msg ->
                         emit(ApiResponseResult.error(msg, result.code().toString()))
+                    } ?: kotlin.run {
+                        emit(ApiResponseResult.error("Server Error", result.code().toString()))
                     }
                 }
             }
diff --git a/feature/login/src/main/java/com/moneybox/minimb/feature/login/domain/utilities/LoginActivityHandler.kt b/feature/login/src/main/java/com/moneybox/minimb/feature/login/domain/utilities/LoginActivityHandler.kt
index 22c8a98..abce61f 100644
--- a/feature/login/src/main/java/com/moneybox/minimb/feature/login/domain/utilities/LoginActivityHandler.kt
+++ b/feature/login/src/main/java/com/moneybox/minimb/feature/login/domain/utilities/LoginActivityHandler.kt
@@ -11,11 +11,8 @@ class LoginActivityHandler (val binding : ActivityLoginBinding){
     fun passwordValidator(editable: Editable) {
         with(binding){
             if (etPassword == null) return
-            val minimumLength = 5
-            if (!TextUtils.isEmpty(editable.toString()) && editable.length < minimumLength) {
-                etPassword.error = "Password must be minimum $minimumLength length"
-            } else {
-                etPassword.error = null
+            if (TextUtils.isEmpty(editable.toString())) {
+                etPassword.error = binding.root.resources.getString(R.string.error_empty_password)
             }
         }
     }
diff --git a/feature/login/src/main/java/com/moneybox/minimb/feature/login/presentation/login/LoginActivity.kt b/feature/login/src/main/java/com/moneybox/minimb/feature/login/presentation/login/LoginActivity.kt
index 1c34a88..ad3689c 100644
--- a/feature/login/src/main/java/com/moneybox/minimb/feature/login/presentation/login/LoginActivity.kt
+++ b/feature/login/src/main/java/com/moneybox/minimb/feature/login/presentation/login/LoginActivity.kt
@@ -43,10 +43,22 @@ class LoginActivity : AppCompatActivity() {
         with(loginViewModel){
             loginClick.observe(this@LoginActivity, Observer {
                 if (it){
-                    if (isNetworkAvailable(this@LoginActivity)) {
-                        login()
+                    if(this.isValid()) {
+                        if (isNetworkAvailable(this@LoginActivity)) {
+                            login()
+                        } else {
+                            Snackbar.make(
+                                binding.root,
+                                getString(R.string.no_internet),
+                                Snackbar.LENGTH_LONG
+                            ).show()
+                        }
                     }else{
-                        Snackbar.make(binding.root, getString(R.string.no_internet), Snackbar.LENGTH_LONG).show()
+                        Snackbar.make(
+                            binding.root,
+                            getString(R.string.empty_fields),
+                            Snackbar.LENGTH_LONG
+                        ).show()
                     }
                 }
             })
diff --git a/feature/login/src/main/java/com/moneybox/minimb/feature/login/presentation/login/LoginViewModel.kt b/feature/login/src/main/java/com/moneybox/minimb/feature/login/presentation/login/LoginViewModel.kt
index 0394a68..947e6a1 100644
--- a/feature/login/src/main/java/com/moneybox/minimb/feature/login/presentation/login/LoginViewModel.kt
+++ b/feature/login/src/main/java/com/moneybox/minimb/feature/login/presentation/login/LoginViewModel.kt
@@ -1,6 +1,7 @@
 package com.moneybox.minimb.feature.login.presentation.login
 
 import android.content.SharedPreferences
+import android.text.TextUtils
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -33,6 +34,7 @@ class LoginViewModel @Inject constructor(private val loginRepository: LoginRepos
     val password = MutableLiveData<String>("")
 
     fun login(){
+
         val userMap = HashMap<String, String>()
         userMap["email"] = email.value!!
         userMap["password"] = password.value!!
@@ -69,4 +71,7 @@ class LoginViewModel @Inject constructor(private val loginRepository: LoginRepos
             _loginResultStored.value = false
         }
     }
+    fun isValid() : Boolean{
+        return !TextUtils.isEmpty(email.value) && !TextUtils.isEmpty(password.value)
+    }
 }
\ No newline at end of file
diff --git a/feature/login/src/main/res/layout/activity_login.xml b/feature/login/src/main/res/layout/activity_login.xml
index d13a28c..4af13a3 100644
--- a/feature/login/src/main/res/layout/activity_login.xml
+++ b/feature/login/src/main/res/layout/activity_login.xml
@@ -25,37 +25,56 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/moneybox_logo"
-        app:layout_constraintBottom_toTopOf="@+id/et_email"
+        app:layout_constraintBottom_toTopOf="@+id/email_text_input_layout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.appcompat.widget.AppCompatEditText
-        android:id="@+id/et_email"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/email_text_input_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="24dp"
-        app:layout_constraintBottom_toTopOf="@+id/et_password"
-        app:layout_constraintTop_toTopOf="parent"
-        android:hint="@string/text_email"
         style="@style/edittext_style"
-        app:layout_constraintVertical_bias="1.0"
-        android:inputType="text"
-        android:text="@={viewModel.email}"
-        android:afterTextChanged="@{(edible)->handler.emailValidator(edible)}"
-        />
+        app:layout_constraintBottom_toTopOf="@+id/password_text_input_layout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0" >
+
+        <androidx.appcompat.widget.AppCompatEditText
+            android:id="@+id/et_email"
+            style="@style/edittext_style"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:afterTextChanged="@{(editable)->handler.emailValidator(editable)}"
+            android:hint="@string/text_email"
+            android:inputType="text"
+            android:text="@={viewModel.email}"/>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <androidx.appcompat.widget.AppCompatEditText
-        android:id="@+id/et_password"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/password_text_input_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/text_password"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         style="@style/edittext_style"
-        android:inputType="textPassword"
-        android:text="@={viewModel.password}"
-        android:afterTextChanged="@{(edible)->handler.passwordValidator(edible)}"/>
+        app:passwordToggleEnabled="true"
+        app:passwordToggleTint="@color/secondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.AppCompatEditText
+            android:id="@+id/et_password"
+            style="@style/edittext_style"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:afterTextChanged="@{(editable)->handler.passwordValidator(editable)}"
+            android:hint="@string/text_password"
+            android:inputType="textPassword"
+
+            android:text="@={viewModel.password}" />
+    </com.google.android.material.textfield.TextInputLayout>
 
     <Button
         android:id="@+id/btn_login"
@@ -81,7 +100,7 @@
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/et_password" />
+        app:layout_constraintTop_toBottomOf="@+id/password_text_input_layout" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/feature/login/src/main/res/values/strings.xml b/feature/login/src/main/res/values/strings.xml
index d2dea13..220bb6f 100644
--- a/feature/login/src/main/res/values/strings.xml
+++ b/feature/login/src/main/res/values/strings.xml
@@ -2,6 +2,7 @@
     <string name="title_activity_login">LoginActivity</string>
     <string name="text_login">LOG IN</string>
     <string name="no_internet">Connection interrupted\nPlease turn on your internet connection</string>
+    <string name="empty_fields">Fields cant be empty</string>
     <string name="text_email">Email</string>
     <string name="text_password">Password</string>
     <string name="error_empty_email">Email can not be empty!</string>
diff --git a/feature/login/src/test/java/com/moneybox/minimb/feature/login/LoginViewModelTest.kt b/feature/login/src/test/java/com/moneybox/minimb/feature/login/LoginViewModelTest.kt
new file mode 100644
index 0000000..5938374
--- /dev/null
+++ b/feature/login/src/test/java/com/moneybox/minimb/feature/login/LoginViewModelTest.kt
@@ -0,0 +1,9 @@
+package com.moneybox.minimb.feature.login
+
+import org.junit.Test
+
+class LoginViewModelTest {
+
+    @Test
+    fun validateEmail(){}
+}
\ No newline at end of file