diff --git a/src/java/org/jivesoftware/spark/ui/ContactList.java b/src/java/org/jivesoftware/spark/ui/ContactList.java
index 5b0ef6e61..45cb2f7dd 100644
--- a/src/java/org/jivesoftware/spark/ui/ContactList.java
+++ b/src/java/org/jivesoftware/spark/ui/ContactList.java
@@ -1104,9 +1104,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
 
 
         final JPopupMenu popup = new JPopupMenu();
-        if (!group.isSharedGroup()) {
-            popup.add(addContactMenu);
-        }
+        popup.add(addContactMenu);
         popup.add(addContactGroupMenu);
         popup.addSeparator();
 
@@ -1956,7 +1954,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
 
         retryPanel.setDisconnectReason(message);
 
-        if (!conflict) {
+        if (false) {
             retryPanel.startTimer();
         }
         else {
diff --git a/src/java/org/jivesoftware/spark/ui/RetryPanel.java b/src/java/org/jivesoftware/spark/ui/RetryPanel.java
index 617f67b56..502ab7429 100644
--- a/src/java/org/jivesoftware/spark/ui/RetryPanel.java
+++ b/src/java/org/jivesoftware/spark/ui/RetryPanel.java
@@ -63,7 +63,7 @@ public class RetryPanel extends JPanel {
         descriptionLabel = new WrappedLabel();
 
         retryButton = new RolloverButton(SparkRes.getImageIcon(SparkRes.SMALL_CHECK));
-        cancelButton = new RolloverButton("Cancel", SparkRes.getImageIcon(SparkRes.SMALL_CIRCLE_DELETE));
+        cancelButton = new RolloverButton("Log Out", SparkRes.getImageIcon(SparkRes.SMALL_CIRCLE_DELETE));
 
         layoutComponents();
 
diff --git a/src/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastPlugin.java b/src/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastPlugin.java
index 9aaf7afc7..ffffbddb6 100644
--- a/src/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastPlugin.java
+++ b/src/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastPlugin.java
@@ -81,7 +81,7 @@ public class BroadcastPlugin implements Plugin, PacketListener {
 
         // Register with action menu
         JMenuItem startConversationtMenu = new JMenuItem("", SparkRes.getImageIcon(SparkRes.SMALL_MESSAGE_IMAGE));
-        ResourceUtils.resButton(startConversationtMenu, "&Start Conversation");
+        ResourceUtils.resButton(startConversationtMenu, "&Start Chat");
         actionsMenu.add(startConversationtMenu);
         startConversationtMenu.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
@@ -94,7 +94,7 @@ public class BroadcastPlugin implements Plugin, PacketListener {
                     selectedUser = contactItem.getFullJID();
                 }
 
-                String jid = (String)JOptionPane.showInputDialog(SparkManager.getMainWindow(), "Enter Address", "Start Conversation", JOptionPane.QUESTION_MESSAGE, null, null, selectedUser);
+                String jid = (String)JOptionPane.showInputDialog(SparkManager.getMainWindow(), "Enter Address", "Start Chat", JOptionPane.QUESTION_MESSAGE, null, null, selectedUser);
                 if (ModelUtil.hasLength(jid) && ModelUtil.hasLength(StringUtils.parseServer(jid))) {
                     if (ModelUtil.hasLength(jid) && jid.indexOf('@') == -1) {
                         // Append server address
diff --git a/src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java b/src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java
index 4987c3f83..f8820e6f6 100644
--- a/src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java
+++ b/src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java
@@ -17,7 +17,7 @@ public class JiveInfo {
     }
 
     public static String getVersion() {
-        return "1.1.9.4";
+        return "1.1.9.5";
     }
 
     public static String getOS() {