diff --git a/src/i2p/bote/SetPasswordFragment.java b/src/i2p/bote/SetPasswordFragment.java
index 2f5d39b..b335d55 100644
--- a/src/i2p/bote/SetPasswordFragment.java
+++ b/src/i2p/bote/SetPasswordFragment.java
@@ -118,6 +118,7 @@ public class SetPasswordFragment extends Fragment {
     }
 
     public static class PasswordWaiterFrag extends TaskFragment<String, String, String> {
+        String currentStatus;
         TextView mStatus;
 
         public static PasswordWaiterFrag newInstance(String... params) {
@@ -134,6 +135,9 @@ public class SetPasswordFragment extends Fragment {
             View v = inflater.inflate(R.layout.dialog_status, container, false);
             mStatus = (TextView) v.findViewById(R.id.status);
 
+            if (currentStatus != null && !currentStatus.isEmpty())
+                mStatus.setText(currentStatus);
+
             return v;
         }
 
@@ -145,7 +149,8 @@ public class SetPasswordFragment extends Fragment {
 
         @Override
         public void updateProgress(String... values) {
-            mStatus.setText(values[0]);
+            currentStatus = values[0];
+            mStatus.setText(currentStatus);
         }
 
         @Override