diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/UsernameUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/util/UsernameUtil.kt
index c391e5bca0..5ac6dc053b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/UsernameUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/UsernameUtil.kt
@@ -9,7 +9,7 @@ object UsernameUtil {
   const val MIN_NICKNAME_LENGTH = 3
   const val MAX_NICKNAME_LENGTH = 32
   const val MIN_DISCRIMINATOR_LENGTH = 2
-  const val MAX_DISCRIMINATOR_LENGTH = 10
+  const val MAX_DISCRIMINATOR_LENGTH = 9
   private val FULL_PATTERN = Pattern.compile(String.format(Locale.US, "^[a-zA-Z_][a-zA-Z0-9_]{%d,%d}$", MIN_NICKNAME_LENGTH - 1, MAX_NICKNAME_LENGTH - 1), Pattern.CASE_INSENSITIVE)
   private val DIGIT_START_PATTERN = Pattern.compile("^[0-9].*$")
   private const val BASE_URL_SCHEMELESS = "signal.me/#eu/"
diff --git a/app/src/main/res/layout/username_edit_fragment.xml b/app/src/main/res/layout/username_edit_fragment.xml
index d250fe54d5..737a043bda 100644
--- a/app/src/main/res/layout/username_edit_fragment.xml
+++ b/app/src/main/res/layout/username_edit_fragment.xml
@@ -92,7 +92,7 @@
         android:imeOptions="actionDone"
         android:importantForAutofill="no"
         android:inputType="number"
-        android:maxLength="19"
+        android:maxLength="9"
         android:maxLines="1"
         android:minHeight="48dp"
         android:paddingHorizontal="16dp"