diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a10a9cc5..5133041b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -93,7 +93,7 @@
         </activity>
         <activity
             android:name="eu.siacs.conversations.ui.PublishProfilePictureActivity"
-            android:label="@string/publish_avatar"
+            android:label="@string/mgmt_account_publish_avatar"
             android:windowSoftInputMode="stateHidden" >
         </activity>
         <activity
diff --git a/res/layout/activity_publish_profile_picture.xml b/res/layout/activity_publish_profile_picture.xml
index b3c6c427..e5d9d1a0 100644
--- a/res/layout/activity_publish_profile_picture.xml
+++ b/res/layout/activity_publish_profile_picture.xml
@@ -69,7 +69,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:enabled="false"
-            android:text="@string/publish_avatar"
+            android:text="@string/publish"
             android:textColor="@color/secondarytext" />
     </LinearLayout>
 
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 19ec1eff..b2b1ff5e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -265,7 +265,7 @@
     <string name="contact_added_you">Der Kontakt hat dich zur Kontaktliste hinzugefügt</string>
     <string name="add_back">Auch hinzufügen</string>
     <string name="contact_has_read_up_to_this_point">%s hat bis zu diesem Punkt gelesen</string>
-    <string name="publish_avatar">Veröffentlichen</string>
+    <string name="publish">Veröffentlichen</string>
     <string name="touch_to_choose_picture">Klicke hier, um einen Avatar auszuwählen</string>
     <string name="publish_avatar_explanation">Achtung: Jeder, der deinen Status sehen darf, sieht auch deinen Avatar.</string>
     <string name="publishing">Veröffentliche&#8230;</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0087e9e9..77e5d2f7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -265,7 +265,7 @@
     <string name="contact_added_you">El contacto te ha añadido a su lista de contactos</string>
     <string name="add_back">Añadir contacto</string>
     <string name="contact_has_read_up_to_this_point">%s ha leído hasta aquí</string>
-    <string name="publish_avatar">Publicar imagen</string>
+    <string name="publish">Publicar</string>
     <string name="touch_to_choose_picture">Pulsa para seleccionar una imagen de la galería</string>
     <string name="publish_avatar_explanation">Nota: Todos tus contactos podrán ver esta imagen.</string>
     <string name="publishing">Publicando&#8230;</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3a849733..223ed984 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -266,7 +266,7 @@
     <string name="contact_added_you">Contact added you to contact list</string>
     <string name="add_back">Add back</string>
     <string name="contact_has_read_up_to_this_point">%s has read up to this point</string>
-    <string name="publish_avatar">Publish avatar</string>
+    <string name="publish">Publish</string>
     <string name="touch_to_choose_picture">Touch avatar to select picture from gallery</string>
     <string name="publish_avatar_explanation">Please note: Everyone subscribed to your presence updates will be allowed to see this picture.</string>
     <string name="publishing">Publishing&#8230;</string>
diff --git a/src/eu/siacs/conversations/ui/EditAccountActivity.java b/src/eu/siacs/conversations/ui/EditAccountActivity.java
index 2d24aa49..d98a0ca7 100644
--- a/src/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -201,7 +201,11 @@ public class EditAccountActivity extends XmppActivity {
 			this.mSaveButton.setEnabled(true);
 			this.mSaveButton.setTextColor(getPrimaryTextColor());
 			if (jidToEdit != null) {
-				this.mSaveButton.setText(R.string.connect);
+				if (mAccount!= null && mAccount.getStatus() == Account.STATUS_ONLINE) {
+					this.mSaveButton.setText(R.string.save);
+				} else {
+					this.mSaveButton.setText(R.string.connect);
+				}
 			} else {
 				this.mSaveButton.setText(R.string.next);
 			}