diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7f0977ec9..646ec4c5e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -24,4 +24,5 @@
     <string name="remove_contact_text">Do you want to delete %s from your roster. The conversation assoziated with this account will not be removed.</string>
     <string name="untrusted_cert_hint">The server %s presented you with an unstrusted, possible self signed, certificate.</string>
     <string name="account_info">Server Info</string>
+    <string name="register_account">Register new account on server</string>
 </resources>
diff --git a/src/eu/siacs/conversations/ui/EditAccount.java b/src/eu/siacs/conversations/ui/EditAccount.java
index 8c180d75a..080b09ea6 100644
--- a/src/eu/siacs/conversations/ui/EditAccount.java
+++ b/src/eu/siacs/conversations/ui/EditAccount.java
@@ -65,9 +65,10 @@ public class EditAccount extends DialogFragment {
 			Log.d("xmppService","mein debugger. account != null");
 			if (account.isOptionSet(Account.OPTION_REGISTER)) {
 				registerAccount.setChecked(true);
-				builder.setTitle("Add account");
+				builder.setTitle(getString(R.string.register_account));
 				okButtonDesc = "Register";
 				passwordConfirm.setVisibility(View.VISIBLE);
+				passwordConfirm.setText(account.getPassword());
 			} else {
 				registerAccount.setVisibility(View.GONE);
 				builder.setTitle("Edit account");
@@ -88,10 +89,12 @@ public class EditAccount extends DialogFragment {
 						Button positiveButton = (Button) d
 								.getButton(Dialog.BUTTON_POSITIVE);
 						if (isChecked) {
+							d.setTitle(getString(R.string.register_account));
 							positiveButton.setText("Register");
 							passwordConfirm.setVisibility(View.VISIBLE);
 							confirmPwDesc.setVisibility(View.VISIBLE);
 						} else {
+							d.setTitle("Add account");
 							passwordConfirm.setVisibility(View.GONE);
 							positiveButton.setText("Add");
 							confirmPwDesc.setVisibility(View.GONE);