diff --git a/app/src/main/res/layout-v14/authentication_dialog.xml b/app/src/main/res/layout-v14/authentication_dialog.xml
index ed05dab1c..00e74c9e1 100644
--- a/app/src/main/res/layout-v14/authentication_dialog.xml
+++ b/app/src/main/res/layout-v14/authentication_dialog.xml
@@ -15,7 +15,10 @@
             android:layout_height="0dp"
             android:layout_weight="1"
             android:layout_margin="16dp"
-            android:hint="@string/username_label"/>
+            android:hint="@string/username_label"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:cursorVisible="true"/>
 
         <EditText
             android:id="@+id/etxtPassword"
@@ -24,7 +27,10 @@
             android:layout_weight="1"
             android:layout_margin="16dp"
             android:inputType="textPassword"
-            android:hint="@string/password_label"/>
+            android:hint="@string/password_label"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:cursorVisible="true"/>
 
         <CheckBox
             android:id="@+id/chkSaveUsernamePassword"
diff --git a/app/src/main/res/layout-v14/download_authentication_activity.xml b/app/src/main/res/layout-v14/download_authentication_activity.xml
index c1fe55ceb..8d2c7fb17 100644
--- a/app/src/main/res/layout-v14/download_authentication_activity.xml
+++ b/app/src/main/res/layout-v14/download_authentication_activity.xml
@@ -31,7 +31,10 @@
         android:layout_margin="16dp"
         android:id="@+id/etxtUsername"
         android:hint="@string/username_label"
-        android:layout_below="@id/txtvDescription"/>
+        android:layout_below="@id/txtvDescription"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:cursorVisible="true"/>
 
     <EditText
         android:layout_width="match_parent"
@@ -40,7 +43,10 @@
         android:id="@+id/etxtPassword"
         android:hint="@string/password_label"
         android:inputType="textPassword"
-        android:layout_below="@id/etxtUsername"/>
+        android:layout_below="@id/etxtUsername"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:cursorVisible="true"/>
 
     <RelativeLayout
         android:id="@+id/footer"
diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml
index b7babbafa..44ba781c2 100644
--- a/app/src/main/res/layout/addfeed.xml
+++ b/app/src/main/res/layout/addfeed.xml
@@ -27,7 +27,10 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:hint="@string/etxtFeedurlHint"
-            android:inputType="textUri"/>
+            android:inputType="textUri"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:cursorVisible="true"/>
 
         <Button
             android:id="@+id/butConfirm"
diff --git a/app/src/main/res/layout/authentication_dialog.xml b/app/src/main/res/layout/authentication_dialog.xml
index 82260eb43..e18ab42eb 100644
--- a/app/src/main/res/layout/authentication_dialog.xml
+++ b/app/src/main/res/layout/authentication_dialog.xml
@@ -16,7 +16,10 @@
             android:layout_height="0dp"
             android:layout_weight="1"
             android:layout_margin="16dp"
-            android:hint="@string/username_label"/>
+            android:hint="@string/username_label"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:cursorVisible="true"/>
 
         <EditText
             android:id="@+id/etxtPassword"
@@ -25,7 +28,10 @@
             android:layout_weight="1"
             android:layout_margin="16dp"
             android:inputType="textPassword"
-            android:hint="@string/password_label"/>
+            android:hint="@string/password_label"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:cursorVisible="true"/>
 
         <CheckBox
             android:id="@+id/chkSaveUsernamePassword"
diff --git a/app/src/main/res/layout/download_authentication_activity.xml b/app/src/main/res/layout/download_authentication_activity.xml
index 69106c9b3..b035f2516 100644
--- a/app/src/main/res/layout/download_authentication_activity.xml
+++ b/app/src/main/res/layout/download_authentication_activity.xml
@@ -31,7 +31,10 @@
         android:layout_margin="16dp"
         android:id="@+id/etxtUsername"
         android:hint="@string/username_label"
-        android:layout_below="@id/txtvDescription"/>
+        android:layout_below="@id/txtvDescription"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:cursorVisible="true"/>
 
     <EditText
         android:layout_width="match_parent"
@@ -40,7 +43,10 @@
         android:id="@+id/etxtPassword"
         android:hint="@string/password_label"
         android:inputType="textPassword"
-        android:layout_below="@id/etxtUsername"/>
+        android:layout_below="@id/etxtUsername"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:cursorVisible="true"/>
 
     <LinearLayout
         android:id="@+id/footer"
diff --git a/app/src/main/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml
index 4dab1e189..3c6202f6d 100644
--- a/app/src/main/res/layout/feedinfo.xml
+++ b/app/src/main/res/layout/feedinfo.xml
@@ -204,7 +204,10 @@
                     android:layout_height="wrap_content"
                     app:layout_row="0"
                     app:layout_column="1"
-                    android:hint="@string/username_label"/>
+                    android:hint="@string/username_label"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:cursorVisible="true"/>
 
                 <TextView
                     android:id="@+id/txtvPassword"
@@ -215,7 +218,10 @@
                     app:layout_row="1"
                     app:layout_column="0"
                     android:text="@string/password_label"
-                    android:textColor="?android:attr/textColorPrimary"/>
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:cursorVisible="true"/>
 
                 <EditText
                     android:id="@+id/etxtPassword"
diff --git a/app/src/main/res/layout/gpodnetauth_credentials.xml b/app/src/main/res/layout/gpodnetauth_credentials.xml
index 8436570fc..13c5977f8 100644
--- a/app/src/main/res/layout/gpodnetauth_credentials.xml
+++ b/app/src/main/res/layout/gpodnetauth_credentials.xml
@@ -30,7 +30,10 @@
         android:layout_height="wrap_content"
         android:hint="@string/username_label"
         android:layout_below="@id/txtvDescription"
-        android:layout_margin="8dp"/>
+        android:layout_margin="8dp"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:cursorVisible="true"/>
 
     <EditText
         android:id="@+id/etxtPassword"
@@ -39,7 +42,10 @@
         android:hint="@string/password_label"
         android:layout_below="@id/etxtUsername"
         android:inputType="textPassword"
-        android:layout_margin="8dp"/>
+        android:layout_margin="8dp"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:cursorVisible="true"/>
 
     <Button
         android:id="@+id/butLogin"