diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 30470d45..251fbc2c 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/java/com/cookiegames/smartcookie/browser/activity/BrowserActivity.kt b/app/src/main/java/com/cookiegames/smartcookie/browser/activity/BrowserActivity.kt
index 0efa6c87..f03b6482 100644
--- a/app/src/main/java/com/cookiegames/smartcookie/browser/activity/BrowserActivity.kt
+++ b/app/src/main/java/com/cookiegames/smartcookie/browser/activity/BrowserActivity.kt
@@ -497,17 +497,18 @@ abstract class BrowserActivity : ThemableBrowserActivity(), BrowserView, UIContr
                 .setCancelable(false)
                 .setNegativeButton(R.string.action_back) { dialog, which ->
                     //listener.onClick(editText.getText().toString());
-                    val settings = Intent(this, SettingsActivity::class.java)
-                    settings.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
-                    startActivity(settings)
+                    moveTaskToBack(true);
+                    exitProcess(-1)
                 }
                 .setPositiveButton(R.string.action_ok
                 ) { _, _ ->
                     //listener.onClick(editText.getText().toString());
-                    if (editText.text.toString() != userPreferences.passwordText){
+                    if (editText.text.toString() != userPreferences.passwordTextLock){
                         val duration = Toast.LENGTH_SHORT
                         val toast = Toast.makeText(this, resources.getString(R.string.wrong_password), duration)
                         toast.show()
+                        moveTaskToBack(true);
+                        exitProcess(-1)
                     }
                 }
 
diff --git a/app/src/main/java/com/cookiegames/smartcookie/settings/fragment/ParentalControlSettingsFragment.kt b/app/src/main/java/com/cookiegames/smartcookie/settings/fragment/ParentalControlSettingsFragment.kt
index c5518846..2be18d3c 100644
--- a/app/src/main/java/com/cookiegames/smartcookie/settings/fragment/ParentalControlSettingsFragment.kt
+++ b/app/src/main/java/com/cookiegames/smartcookie/settings/fragment/ParentalControlSettingsFragment.kt
@@ -179,7 +179,7 @@ class ParentalControlSettingsFragment : AbstractSettingsFragment() {
             val values = PasswordChoice.values().map {
                 Pair(it, when (it) {
                     PasswordChoice.NONE -> stringArray[0]
-                    PasswordChoice.CUSTOM -> stringArray[1]
+                    PasswordChoice.CUSTOM -> resources.getString(R.string.enter_password)
                 })
             }
             withSingleChoiceItems(values, userPreferences.passwordChoice) {
diff --git a/app/src/main/java/com/cookiegames/smartcookie/settings/fragment/PrivacySettingsFragment.kt b/app/src/main/java/com/cookiegames/smartcookie/settings/fragment/PrivacySettingsFragment.kt
index 526b9a18..392cb7bb 100644
--- a/app/src/main/java/com/cookiegames/smartcookie/settings/fragment/PrivacySettingsFragment.kt
+++ b/app/src/main/java/com/cookiegames/smartcookie/settings/fragment/PrivacySettingsFragment.kt
@@ -163,7 +163,7 @@ class PrivacySettingsFragment : AbstractSettingsFragment() {
             val values = PasswordChoice.values().map {
                 Pair(it, when (it) {
                     PasswordChoice.NONE -> stringArray[0]
-                    PasswordChoice.CUSTOM -> stringArray[1]
+                    PasswordChoice.CUSTOM -> resources.getString(R.string.enter_password)
                 })
             }
             withSingleChoiceItems(values, userPreferences.passwordChoiceLock) {