diff --git a/app/src/main/java/i2p/bote/android/EmailListFragment.java b/app/src/main/java/i2p/bote/android/EmailListFragment.java
index 4637600..69beb22 100644
--- a/app/src/main/java/i2p/bote/android/EmailListFragment.java
+++ b/app/src/main/java/i2p/bote/android/EmailListFragment.java
@@ -157,6 +157,10 @@ public class EmailListFragment extends ListFragment implements
         } else {
             getActivity().setTitle(
                     BoteHelper.getFolderDisplayName(getActivity(), mFolder));
+            if (I2PBote.getInstance().isPasswordRequired()) {
+                // Request a password from the user.
+                BoteHelper.requestPassword(getActivity(), null);
+            }
         }
     }
 
@@ -168,17 +172,6 @@ public class EmailListFragment extends ListFragment implements
             if (I2PBote.getInstance().isPasswordRequired()) {
                 // Ensure any existing data is destroyed.
                 destroyList();
-                // Request a password from the user.
-                BoteHelper.requestPassword(getActivity(), new BoteHelper.RequestPasswordListener() {
-                    @Override
-                    public void onPasswordVerified() {
-                        initializeList();
-                    }
-
-                    @Override
-                    public void onPasswordCanceled() {
-                    }
-                });
             } else {
                 // Password is cached, or not set.
                 initializeList();
diff --git a/app/src/main/java/i2p/bote/android/util/BoteHelper.java b/app/src/main/java/i2p/bote/android/util/BoteHelper.java
index 7a9e0a8..ef48540 100644
--- a/app/src/main/java/i2p/bote/android/util/BoteHelper.java
+++ b/app/src/main/java/i2p/bote/android/util/BoteHelper.java
@@ -302,7 +302,8 @@ public class BoteHelper extends GeneralHelper {
             @Override
             public void onClick(DialogInterface dialog, int id) {
                 dialog.cancel();
-                listener.onPasswordCanceled();
+                if (listener != null)
+                    listener.onPasswordCanceled();
             }
         });
         AlertDialog passwordDialog = builder.create();
@@ -356,7 +357,8 @@ public class BoteHelper extends GeneralHelper {
         protected void onPostExecute(String result) {
             // Password is valid
             mDialog.dismiss();
-            mListener.onPasswordVerified();
+            if (mListener != null)
+                mListener.onPasswordVerified();
         }
     }
 }