diff --git a/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java b/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java
index cabcb83..418436a 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java
@@ -62,27 +62,26 @@ public class GenerateReviewFragment extends Fragment {
     static final public String VIEW_TYPE_ACCEPT = "accept";
     static final public String VIEW_TYPE_WALLET = "wallet";
 
-    ScrollView scrollview;
+    public static final String REQUEST_TYPE = "type";
+    public static final String REQUEST_PATH = "path";
+    public static final String REQUEST_PASSWORD = "password";
 
-    ProgressBar pbProgress;
-    TextView tvWalletPassword;
-    TextView tvWalletAddress;
-    TextView tvWalletMnemonic;
-    TextView tvWalletViewKey;
-    TextView tvWalletSpendKey;
-    ImageButton bCopyAddress;
-    LinearLayout llAdvancedInfo;
-    LinearLayout llPassword;
-    Button bAdvancedInfo;
-    Button bAccept;
+    private ScrollView scrollview;
 
-    // TODO fix visibility of variables
-    String walletPath;
-    String walletName;
-    // we need to keep the password so the user is not asked again if they want to change it
-    // note they can only enter this fragment immediately after entering the password
-    // so asking them to enter it a couple of seconds later seems silly
-    String walletPassword = null;
+    private ProgressBar pbProgress;
+    private TextView tvWalletPassword;
+    private TextView tvWalletAddress;
+    private TextView tvWalletMnemonic;
+    private TextView tvWalletViewKey;
+    private TextView tvWalletSpendKey;
+    private ImageButton bCopyAddress;
+    private LinearLayout llAdvancedInfo;
+    private LinearLayout llPassword;
+    private Button bAdvancedInfo;
+    private Button bAccept;
+
+    private String walletPath;
+    private String walletName;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -136,14 +135,14 @@ public class GenerateReviewFragment extends Fragment {
         });
 
         Bundle args = getArguments();
-        type = args.getString("type");
-        walletPath = args.getString("path");
-        showDetails(args.getString("password"));
+        type = args.getString(REQUEST_TYPE);
+        walletPath = args.getString(REQUEST_PATH);
+        localPassword = args.getString(REQUEST_PASSWORD);
+        showDetails();
         return view;
     }
 
-    void showDetails(String password) {
-        walletPassword = password;
+    void showDetails() {
         showProgress();
         tvWalletPassword.setText(null);
         new AsyncShow().executeOnExecutor(MoneroThreadPoolExecutor.MONERO_THREAD_POOL_EXECUTOR, walletPath);
@@ -178,7 +177,7 @@ public class GenerateReviewFragment extends Fragment {
 
     private void acceptWallet() {
         bAccept.setEnabled(false);
-        acceptCallback.onAccept(walletName, walletPassword);
+        acceptCallback.onAccept(walletName, getPassword());
     }
 
     private class AsyncShow extends AsyncTask<String, Void, Boolean> {
@@ -201,7 +200,7 @@ public class GenerateReviewFragment extends Fragment {
                 wallet = GenerateReviewFragment.this.walletCallback.getWallet();
                 closeWallet = false;
             } else {
-                wallet = WalletManager.getInstance().openWallet(walletPath, walletPassword);
+                wallet = WalletManager.getInstance().openWallet(walletPath, getPassword());
                 closeWallet = true;
             }
             name = wallet.getName();
@@ -231,10 +230,8 @@ public class GenerateReviewFragment extends Fragment {
                     bAccept.setVisibility(View.VISIBLE);
                     bAccept.setEnabled(true);
                 }
-                if (walletPassword != null) {
-                    llPassword.setVisibility(View.VISIBLE);
-                    tvWalletPassword.setText(walletPassword);
-                }
+                llPassword.setVisibility(View.VISIBLE);
+                tvWalletPassword.setText(getPassword());
                 tvWalletAddress.setText(address);
                 tvWalletMnemonic.setText(seed);
                 tvWalletViewKey.setText(viewKey);
@@ -260,6 +257,7 @@ public class GenerateReviewFragment extends Fragment {
     ProgressListener progressCallback = null;
     AcceptListener acceptCallback = null;
     ListenerWithWallet walletCallback = null;
+    PasswordChangedListener passwordCallback = null;
 
     public interface Listener {
         void setTitle(String title, String subtitle);
@@ -282,6 +280,24 @@ public class GenerateReviewFragment extends Fragment {
         Wallet getWallet();
     }
 
+    public interface PasswordChangedListener {
+        void onPasswordChanged(String newPassword);
+
+        String getPassword();
+    }
+
+    private String localPassword = null;
+
+    private String getPassword() {
+        if (passwordCallback != null) return passwordCallback.getPassword();
+        return localPassword;
+    }
+
+    private void setPassword(String password) {
+        if (passwordCallback != null) passwordCallback.onPasswordChanged(password);
+        else localPassword = password;
+    }
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -297,6 +313,9 @@ public class GenerateReviewFragment extends Fragment {
         if (context instanceof ListenerWithWallet) {
             this.walletCallback = (ListenerWithWallet) context;
         }
+        if (context instanceof PasswordChangedListener) {
+            this.passwordCallback = (PasswordChangedListener) context;
+        }
     }
 
     @Override
@@ -328,7 +347,7 @@ public class GenerateReviewFragment extends Fragment {
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        String type = getArguments().getString("type");
+        String type = getArguments().getString(REQUEST_TYPE); // intance variable <type> not set yet
         if (GenerateReviewFragment.VIEW_TYPE_ACCEPT.equals(type)) {
             inflater.inflate(R.menu.wallet_details_help_menu, menu);
             super.onCreateOptionsMenu(menu, inflater);
@@ -345,7 +364,7 @@ public class GenerateReviewFragment extends Fragment {
             wallet = GenerateReviewFragment.this.walletCallback.getWallet();
             closeWallet = false;
         } else {
-            wallet = WalletManager.getInstance().openWallet(walletPath, walletPassword);
+            wallet = WalletManager.getInstance().openWallet(walletPath, getPassword());
             closeWallet = true;
         }
 
@@ -400,7 +419,8 @@ public class GenerateReviewFragment extends Fragment {
                 progressCallback.dismissProgressDialog();
             if (result) {
                 Toast.makeText(getActivity(), getString(R.string.changepw_success), Toast.LENGTH_SHORT).show();
-                showDetails(newPassword);
+                setPassword(newPassword);
+                showDetails();
             } else {
                 Toast.makeText(getActivity(), getString(R.string.changepw_failed), Toast.LENGTH_LONG).show();
             }
@@ -527,7 +547,7 @@ public class GenerateReviewFragment extends Fragment {
                         } else if (!newPasswordA.equals(newPasswordB)) {
                             etPasswordB.setError(getString(R.string.generate_bad_passwordB));
                         } else if (newPasswordA.equals(newPasswordB)) {
-                            new AsyncChangePassword().execute(walletName, walletPassword, newPasswordA, Boolean.toString(swFingerprintAllowed.isChecked()));
+                            new AsyncChangePassword().execute(walletName, getPassword(), newPasswordA, Boolean.toString(swFingerprintAllowed.isChecked()));
                             Helper.hideKeyboardAlways(getActivity());
                             openDialog.dismiss();
                             openDialog = null;
@@ -549,7 +569,7 @@ public class GenerateReviewFragment extends Fragment {
                     } else if (!newPasswordA.equals(newPasswordB)) {
                         etPasswordB.setError(getString(R.string.generate_bad_passwordB));
                     } else if (newPasswordA.equals(newPasswordB)) {
-                        new AsyncChangePassword().execute(walletName, walletPassword, newPasswordA, Boolean.toString(swFingerprintAllowed.isChecked()));
+                        new AsyncChangePassword().execute(walletName, getPassword(), newPasswordA, Boolean.toString(swFingerprintAllowed.isChecked()));
                         Helper.hideKeyboardAlways(getActivity());
                         openDialog.dismiss();
                         openDialog = null;
diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
index abfd24f..2c38937 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
@@ -55,6 +55,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
         WalletService.Observer, SendFragment.Listener, TxFragment.Listener,
         GenerateReviewFragment.ListenerWithWallet,
         GenerateReviewFragment.Listener,
+        GenerateReviewFragment.PasswordChangedListener,
         ScannerFragment.OnScannedListener, ReceiveFragment.Listener,
         SendAddressWizardFragment.OnScanListener {
 
@@ -65,6 +66,18 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
     private Toolbar toolbar;
     private boolean needVerifyIdentity;
 
+    private String password;
+
+    @Override
+    public void onPasswordChanged(String newPassword) {
+        password = newPassword;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
     @Override
     public void setToolbarButton(int type) {
         toolbar.setButton(type);
@@ -119,9 +132,8 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
         if (extras != null) {
             acquireWakeLock();
             String walletId = extras.getString(REQUEST_ID);
-            String walletPassword = extras.getString(REQUEST_PW);
             needVerifyIdentity = extras.getBoolean(REQUEST_FINGERPRINT_USED);
-            connectWalletService(walletId, walletPassword);
+            connectWalletService(walletId, password);
         } else {
             finish();
             //throw new IllegalStateException("No extras passed! Panic!");
@@ -186,7 +198,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
         }
     }
 
-    public void onWalletChangePassword() {//final String walletName, final String walletPassword) {
+    public void onWalletChangePassword() {
         try {
             GenerateReviewFragment detailsFragment = (GenerateReviewFragment)
                     getSupportFragmentManager().findFragmentById(R.id.fragment_container);
@@ -247,6 +259,8 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
                 .add(R.id.fragment_container, walletFragment, WalletFragment.class.getName()).commit();
         Timber.d("fragment added");
 
+        password = getIntent().getExtras().getString(REQUEST_PW);
+
         startWalletService();
         Timber.d("onCreate() done.");
     }
@@ -709,8 +723,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis
                 switch (which) {
                     case DialogInterface.BUTTON_POSITIVE:
                         final Bundle extras = new Bundle();
-                        extras.putString("type", GenerateReviewFragment.VIEW_TYPE_WALLET);
-                        extras.putString("password", getIntent().getExtras().getString(REQUEST_PW));
+                        extras.putString(GenerateReviewFragment.REQUEST_TYPE, GenerateReviewFragment.VIEW_TYPE_WALLET);
 
                         if (needVerifyIdentity) {
                             Helper.promptPassword(WalletActivity.this, getWallet().getName(), true, new Helper.PasswordAction() {
diff --git a/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java b/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java
index 7c20556..02e7b84 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java
@@ -166,7 +166,7 @@ public class Wallet {
 
 //TODO static static bool keyValid(const std::string &secret_key_string, const std::string &address_string, bool isViewKey, bool testnet, std::string &error);
 
-    public static native String getPaymentIdFromAddress(String address, boolean isTestNet);
+    public static native String getPaymentIdFromAddress(String address, int networkType);
 
     public static native long getMaximumAllowedAmount();
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index de7ed2f..50d6cc7 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -224,7 +224,7 @@
     <string name="send_paymentid_hint">Zahlungs-ID (optional)</string>
     <string name="send_amount_hint">0.00</string>
     <string name="send_notes_hint">Private Notizen (optional)</string>
-    <string name="send_generate_paymentid_hint">Generieren</string>
+    <string name="send_generate_paymentid_hint">Erzeuge</string>
     <string name="send_qr_hint">Scannen</string>
     <string name="send_send_label">Gib meine wertvollen Moneroj aus</string>
     <string name="send_send_timed_label">Gib meine wertvollen Moneroj aus (%1$s)</string>