diff --git a/android/app/src/google/res/layout/osm_login_text_input.xml b/android/app/src/google/res/layout/osm_login_text_input.xml
new file mode 100644
index 0000000000..a896cabd19
--- /dev/null
+++ b/android/app/src/google/res/layout/osm_login_text_input.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.textfield.TextInputEditText
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/osm_username"
+    style="@style/MwmWidget.Editor.FieldLayout.EditText"
+    android:hint="@string/username" />
diff --git a/android/app/src/main/res/layout/fragment_osm_login.xml b/android/app/src/main/res/layout/fragment_osm_login.xml
index 3868214a12..16391b4c33 100644
--- a/android/app/src/main/res/layout/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout/fragment_osm_login.xml
@@ -65,11 +65,7 @@
         android:layout_marginTop="@dimen/margin_half"
         android:textColorHint="?android:textColorSecondary"
         app:endIconMode="custom">
-        <com.google.android.material.textfield.TextInputEditText
-          android:id="@+id/osm_username"
-          style="@style/MwmWidget.Editor.FieldLayout.EditText"
-          android:autofillHints="emailAddress"
-          android:hint="@string/email_or_username" />
+        <include layout="@layout/osm_login_text_input"/>
       </com.google.android.material.textfield.TextInputLayout>
       <com.google.android.material.textfield.TextInputLayout
         style="@style/MwmWidget.Editor.CustomTextInput"
diff --git a/android/app/src/main/res/layout/osm_login_text_input.xml b/android/app/src/main/res/layout/osm_login_text_input.xml
new file mode 100644
index 0000000000..ccbf404ca6
--- /dev/null
+++ b/android/app/src/main/res/layout/osm_login_text_input.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.textfield.TextInputEditText
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/osm_username"
+  style="@style/MwmWidget.Editor.FieldLayout.EditText"
+  android:autofillHints="emailAddress"
+  android:hint="@string/email_or_username" />