diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/slides/CustomAuthenticationSlide.java b/app/src/main/java/com/beemdevelopment/aegis/ui/slides/CustomAuthenticationSlide.java
index 289b5980..1c69fb57 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/slides/CustomAuthenticationSlide.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/slides/CustomAuthenticationSlide.java
@@ -38,6 +38,7 @@ public class CustomAuthenticationSlide extends Fragment implements ISlidePolicy,
             TextView text = view.findViewById(R.id.text_rb_biometrics);
             button.setEnabled(true);
             text.setEnabled(true);
+            _buttonGroup.check(R.id.rb_biometrics);
         }
 
         view.findViewById(R.id.main).setBackgroundColor(_bgColor);
diff --git a/app/src/main/res/layout/dialog_password.xml b/app/src/main/res/layout/dialog_password.xml
index 63e5094b..d73d74ee 100644
--- a/app/src/main/res/layout/dialog_password.xml
+++ b/app/src/main/res/layout/dialog_password.xml
@@ -7,6 +7,14 @@
     android:paddingBottom="10dp"
     android:paddingEnd="20dp"
     android:paddingTop="10dp">
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/authentication_method_password_explanation"
+        android:textColor="#FF0000"
+        android:textStyle="bold"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"/>
     <EditText
         android:id="@+id/text_password"
         android:hint="@string/password"
diff --git a/app/src/main/res/layout/fragment_authenticated_slide.xml b/app/src/main/res/layout/fragment_authenticated_slide.xml
index f7d9cac4..2af04750 100644
--- a/app/src/main/res/layout/fragment_authenticated_slide.xml
+++ b/app/src/main/res/layout/fragment_authenticated_slide.xml
@@ -14,11 +14,19 @@
         android:textColor="@color/primary_text_inverted"
         android:id="@+id/textView2" />
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/authentication_method_password_explanation"
+        android:textColor="#FFFF00"
+        android:textStyle="bold"
+        android:layout_marginTop="24dp" />
+
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp">
+        android:layout_marginTop="24dp">
 
         <TextView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_authentication_slide.xml b/app/src/main/res/layout/fragment_authentication_slide.xml
index 6b87d1f7..8c64922b 100644
--- a/app/src/main/res/layout/fragment_authentication_slide.xml
+++ b/app/src/main/res/layout/fragment_authentication_slide.xml
@@ -20,13 +20,19 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="12dp"
-        android:orientation="horizontal">
+        android:layout_marginTop="24dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/authentication_method_explanation"/>
 
         <RadioGroup
             android:id="@+id/rg_authenticationMethod"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp">
 
             <RadioButton
                 android:id="@+id/rb_none"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 171596bc..6ebd9cce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -47,10 +47,12 @@
     <string name="pref_set_password_summary">Set a new password which you will need to unlock your vault</string>
 
     <string name="choose_authentication_method">Security</string>
+    <string name="authentication_method_explanation">Aegis is a security-focused 2FA app. Tokens are stored in a vault, that can optionally be encrypted with a password of your choosing. If an attacker obtains your encrypted vault file, they will not be able to access the contents without knowing the password.\n\nWe\'ve preselected the option that we think would fit best for your device.</string>
     <string name="authentication_method_none">None</string>
-    <string name="authentication_method_none_description">You don\'t need a password to unlock the vault and it will not be encrypted. This option is not recommended.</string>
+    <string name="authentication_method_none_description">No password is needed to unlock the vault and it will not be encrypted. <b>This option is not recommended</b>.</string>
     <string name="authentication_method_password">Password</string>
-    <string name="authentication_method_password_description">You need a password to unlock the vault.</string>
+    <string name="authentication_method_password_description">A password is needed to unlock the vault.</string>
+    <string name="authentication_method_password_explanation">Warning: If you forget your password, you will permanently lose access to your tokens. There is no way to recover them without the password.</string>
     <string name="authentication_method_biometrics">Biometrics</string>
     <string name="authentication_method_biometrics_description">In addition to a password, biometrics registered on this device, like a fingerprint or your face, can be used to unlock the vault.</string>
     <string name="authentication_method_set_password">Password</string>