diff --git a/FindSportEvents/app/src/main/java/com/bounswe/findsportevents/login/SignupActivity.kt b/FindSportEvents/app/src/main/java/com/bounswe/findsportevents/login/SignupActivity.kt
index 7c144565..15373f6b 100644
--- a/FindSportEvents/app/src/main/java/com/bounswe/findsportevents/login/SignupActivity.kt
+++ b/FindSportEvents/app/src/main/java/com/bounswe/findsportevents/login/SignupActivity.kt
@@ -60,6 +60,14 @@ class SignupActivity : AppCompatActivity() {
             }
 
             override fun afterTextChanged(p0: Editable?) {
+                if((binding.etPasswordConfirm.text?.length ?: 0 == binding.etPassword.text?.length ?:0) &&
+                    binding.etPasswordConfirm.text.toString() != binding.etPassword.text.toString() ) {
+                    Toast.makeText(
+                        applicationContext,
+                        "Password and confirmation password do not match!",
+                        Toast.LENGTH_LONG
+                    ).show()
+                }
                 checkFields()
             }
         })
diff --git a/FindSportEvents/app/src/main/res/layout/activity_signup.xml b/FindSportEvents/app/src/main/res/layout/activity_signup.xml
index 7e1ddb12..d6a90c43 100644
--- a/FindSportEvents/app/src/main/res/layout/activity_signup.xml
+++ b/FindSportEvents/app/src/main/res/layout/activity_signup.xml
@@ -29,6 +29,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/space_xx_large"
+                android:inputType="textPassword"
                 android:hint="@string/password" />
 
             <com.google.android.material.textfield.TextInputEditText
@@ -36,6 +37,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/space_xx_large"
+                android:inputType="textPassword"
                 android:hint="@string/confirm_password" />
 
             <com.google.android.material.textfield.TextInputEditText