diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
index eddf0ef53..fbecc18a6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@@ -114,6 +114,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
             appearanceButton.setOnClickListener { showAppearanceSettings() }
             inviteFriendButton.setOnClickListener { sendInvitation() }
             helpButton.setOnClickListener { showHelp() }
+            passwordDivider.isGone = prefs.getHidePassword()
             passwordButton.isGone = prefs.getHidePassword()
             passwordButton.setOnClickListener { showPassword() }
             clearAllDataButton.setOnClickListener { clearAllData() }
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index cba479b13..96e011b53 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -398,6 +398,7 @@
                 </RelativeLayout>
 
                 <View
+                    android:id="@+id/passwordDivider"
                     android:layout_marginHorizontal="@dimen/very_large_spacing"
                     android:layout_width="match_parent"
                     android:layout_height="1dp"