diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt b/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt
index 1b726deb05..a330857e0e 100644
--- a/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt
@@ -205,7 +205,7 @@ class ProfileFragment : Fragment(), BottomIconDoubleClick {
                     layout.textInputLayoutNewPassword.isEndIconVisible = true
                 }
 
-                if (layout.newPassword.text.toString().length >= 6) {
+                if (layout.newPassword.text.toString().length >= MINIMUM_PASSWORD_LENGTH) {
                     layout.textInputLayoutNewPassword.error = null
                     layout.textInputLayoutNewPassword.isErrorEnabled = false
                 } else {
@@ -220,7 +220,7 @@ class ProfileFragment : Fragment(), BottomIconDoubleClick {
                 }
                 when (layout.textInputLayoutConfirmNewPassword.isErrorEnabled ||
                     layout.textInputLayoutNewPassword.isErrorEnabled ||
-                    layout.oldPassword.text.toString().length < 6) {
+                    layout.oldPassword.text.toString().length < MINIMUM_PASSWORD_LENGTH) {
                     true -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false
                     false -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = true
                 }
@@ -245,7 +245,7 @@ class ProfileFragment : Fragment(), BottomIconDoubleClick {
                 }
                 when (layout.textInputLayoutConfirmNewPassword.isErrorEnabled ||
                     layout.textInputLayoutNewPassword.isErrorEnabled ||
-                    layout.oldPassword.text.toString().length < 6) {
+                    layout.oldPassword.text.toString().length < MINIMUM_PASSWORD_LENGTH) {
                     true -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false
                     false -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = true
                 }
@@ -259,7 +259,7 @@ class ProfileFragment : Fragment(), BottomIconDoubleClick {
             override fun afterTextChanged(p0: Editable?) {
                 when (layout.textInputLayoutConfirmNewPassword.isErrorEnabled ||
                     layout.textInputLayoutNewPassword.isErrorEnabled ||
-                    layout.oldPassword.text.toString().length < 6) {
+                    layout.oldPassword.text.toString().length < MINIMUM_PASSWORD_LENGTH) {
                     true -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false
                     false -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = true
                 }
diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/SignUpFragment.kt b/app/src/main/java/org/fossasia/openevent/general/auth/SignUpFragment.kt
index caf454440b..a0d2713c36 100644
--- a/app/src/main/java/org/fossasia/openevent/general/auth/SignUpFragment.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/auth/SignUpFragment.kt
@@ -43,7 +43,7 @@ import org.fossasia.openevent.general.utils.extensions.setSharedElementEnterTran
 import org.jetbrains.anko.design.longSnackbar
 import org.jetbrains.anko.design.snackbar
 
-private const val MINIMUM_PASSWORD_LENGTH = 8
+const val MINIMUM_PASSWORD_LENGTH = 8
 
 class SignUpFragment : Fragment() {
 
diff --git a/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt
index e7192ae7a2..e08132eafc 100644
--- a/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt
@@ -24,6 +24,7 @@ import kotlinx.android.synthetic.main.dialog_change_password.view.textInputLayou
 import org.fossasia.openevent.general.BuildConfig
 import org.fossasia.openevent.general.PLAY_STORE_BUILD_FLAVOR
 import org.fossasia.openevent.general.R
+import org.fossasia.openevent.general.auth.MINIMUM_PASSWORD_LENGTH
 import org.fossasia.openevent.general.auth.ProfileViewModel
 import org.fossasia.openevent.general.auth.SmartAuthUtil
 import org.fossasia.openevent.general.auth.SmartAuthViewModel
@@ -189,7 +190,7 @@ class SettingsFragment : PreferenceFragmentCompat(), PreferenceChangeListener {
                     layout.textInputLayoutNewPassword.isEndIconVisible = true
                 }
 
-                if (layout.newPassword.text.toString().length >= 6) {
+                if (layout.newPassword.text.toString().length >= MINIMUM_PASSWORD_LENGTH) {
                     layout.textInputLayoutNewPassword.error = null
                     layout.textInputLayoutNewPassword.isErrorEnabled = false
                 } else {
@@ -204,7 +205,7 @@ class SettingsFragment : PreferenceFragmentCompat(), PreferenceChangeListener {
                 }
                 when (layout.textInputLayoutConfirmNewPassword.isErrorEnabled ||
                     layout.textInputLayoutNewPassword.isErrorEnabled ||
-                    layout.oldPassword.text.toString().length < 6) {
+                    layout.oldPassword.text.toString().length < MINIMUM_PASSWORD_LENGTH) {
                     true -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false
                     false -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = true
                 }
@@ -234,7 +235,7 @@ class SettingsFragment : PreferenceFragmentCompat(), PreferenceChangeListener {
                 }
                 when (layout.textInputLayoutConfirmNewPassword.isErrorEnabled ||
                     layout.textInputLayoutNewPassword.isErrorEnabled ||
-                    layout.oldPassword.text.toString().length < 6) {
+                    layout.oldPassword.text.toString().length < MINIMUM_PASSWORD_LENGTH) {
                     true -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false
                     false -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = true
                 }
@@ -253,7 +254,7 @@ class SettingsFragment : PreferenceFragmentCompat(), PreferenceChangeListener {
                  */
                 when (layout.textInputLayoutConfirmNewPassword.isErrorEnabled ||
                     layout.textInputLayoutNewPassword.isErrorEnabled ||
-                    layout.oldPassword.text.toString().length < 6) {
+                    layout.oldPassword.text.toString().length < MINIMUM_PASSWORD_LENGTH) {
                     true -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false
                     false -> alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = true
                 }