diff --git a/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameState.kt b/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameState.kt
index 1fd84ea0f2..e8caee4ee9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/nicknames/NicknameState.kt
@@ -19,11 +19,11 @@ data class NicknameState(
 ) {
 
   private val isFormBlank: Boolean = firstName.isBlank() && lastName.isBlank() && note.isBlank()
-  private val hasFirstNameOrNote: Boolean = firstName.isNotBlank() || note.isNotBlank()
+  private val hasNameOrNote: Boolean = firstName.isNotBlank() || lastName.isNotBlank() || note.isNotBlank()
   private val isFormReady: Boolean = formState == FormState.READY
   private val isBlankFormDuringEdit: Boolean = isFormBlank && isEditing
 
-  val canSave: Boolean = isFormReady && (hasFirstNameOrNote || isBlankFormDuringEdit)
+  val canSave: Boolean = isFormReady && (hasNameOrNote || isBlankFormDuringEdit)
   enum class FormState {
     LOADING,
     READY,