diff --git a/android/dms-capture/app/src/main/res/layout/activity_login.xml b/android/dms-capture/app/src/main/res/layout/activity_login.xml
index 5e6367c1..6a5b2002 100644
--- a/android/dms-capture/app/src/main/res/layout/activity_login.xml
+++ b/android/dms-capture/app/src/main/res/layout/activity_login.xml
@@ -25,14 +25,16 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="E-Mail"
-        android:inputType="textEmailAddress" />
+        android:inputType="textEmailAddress"
+        android:autofillHints="username" />
 
     <EditText
         android:id="@+id/passwordInput"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="Passwort"
-        android:inputType="textPassword" />
+        android:inputType="textPassword"
+        android:autofillHints="password" />
 
     <Button
         android:id="@+id/loginButton"