diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java
index d89cc41ca..d7b2dc536 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java
@@ -1,38 +1,50 @@
 package de.danoeh.antennapod.dialog;
 
 import android.content.Context;
-import android.view.View;
-import android.widget.EditText;
+import android.text.method.HideReturnsTransformationMethod;
+import android.text.method.PasswordTransformationMethod;
+import android.view.LayoutInflater;
 import androidx.appcompat.app.AlertDialog;
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.databinding.AuthenticationDialogBinding;
 
 /**
  * Displays a dialog with a username and password text field and an optional checkbox to save username and preferences.
  */
 public abstract class AuthenticationDialog extends AlertDialog.Builder {
+    boolean passwordHidden = true;
 
     public AuthenticationDialog(Context context, int titleRes, boolean enableUsernameField,
                                 String usernameInitialValue, String passwordInitialValue) {
         super(context);
         setTitle(titleRes);
-        View rootView = View.inflate(context, R.layout.authentication_dialog, null);
-        setView(rootView);
+        AuthenticationDialogBinding viewBinding = AuthenticationDialogBinding.inflate(LayoutInflater.from(context));
+        setView(viewBinding.getRoot());
 
-        final EditText etxtUsername = rootView.findViewById(R.id.etxtUsername);
-        final EditText etxtPassword = rootView.findViewById(R.id.etxtPassword);
-
-        etxtUsername.setEnabled(enableUsernameField);
+        viewBinding.usernameEditText.setEnabled(enableUsernameField);
         if (usernameInitialValue != null) {
-            etxtUsername.setText(usernameInitialValue);
+            viewBinding.usernameEditText.setText(usernameInitialValue);
         }
         if (passwordInitialValue != null) {
-            etxtPassword.setText(passwordInitialValue);
+            viewBinding.passwordEditText.setText(passwordInitialValue);
         }
+        viewBinding.showPasswordButton.setOnClickListener(v -> {
+            if (passwordHidden) {
+                viewBinding.passwordEditText.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
+                viewBinding.showPasswordButton.setAlpha(1.0f);
+            } else {
+                viewBinding.passwordEditText.setTransformationMethod(PasswordTransformationMethod.getInstance());
+                viewBinding.showPasswordButton.setAlpha(0.6f);
+            }
+            passwordHidden = !passwordHidden;
+        });
+
         setOnCancelListener(dialog -> onCancelled());
         setOnDismissListener(dialog -> onCancelled());
         setNegativeButton(R.string.cancel_label, null);
         setPositiveButton(R.string.confirm_label, (dialog, which)
-                -> onConfirmed(etxtUsername.getText().toString(), etxtPassword.getText().toString()));
+                -> onConfirmed(viewBinding.usernameEditText.getText().toString(),
+                        viewBinding.passwordEditText.getText().toString()));
     }
 
     protected void onCancelled() {
diff --git a/app/src/main/res/layout/authentication_dialog.xml b/app/src/main/res/layout/authentication_dialog.xml
index 9c6f3e2bb..f311fc1dd 100644
--- a/app/src/main/res/layout/authentication_dialog.xml
+++ b/app/src/main/res/layout/authentication_dialog.xml
@@ -1,30 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical" >
-
-    <EditText
-        android:id="@+id/etxtUsername"
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_margin="16dp"
-        android:hint="@string/username_label"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:cursorVisible="true"/>
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:padding="16dp">
 
-    <EditText
-        android:id="@+id/etxtPassword"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_margin="16dp"
-        android:inputType="textPassword"
-        android:hint="@string/password_label"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:cursorVisible="true"/>
+    <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp">
 
+        <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/usernameEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/username_label"
+                android:lines="1"/>
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+        <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
+
+            <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/passwordEditText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/password_label"
+                    android:inputType="textPassword"
+                    android:lines="1"/>
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.joanzapata.iconify.widget.IconTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/showPasswordButton"
+                android:text="{fa-eye}"
+                android:padding="8dp"
+                android:textColor="?android:attr/textColorPrimary"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:alpha="0.6"
+                android:textSize="20sp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginStart="8dp"/>
+
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index e289d9afb..a52b30512 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -95,7 +95,6 @@
     <string name="description_label">Description</string>
     <string name="episodes_suffix">\u0020episodes</string>
     <string name="processing_label">Processing</string>
-    <string name="save_username_password_label">Save username and password</string>
     <string name="close_label">Close</string>
     <string name="retry_label">Retry</string>
     <string name="auto_download_label">Include in auto downloads</string>