diff --git a/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/MessagingManager.java b/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/MessagingManager.java
index 772aa1554100f87be23f71ae8bb72dc9f87f3e00..11cb56bba3071b6c5232ff6694481755e2bf8614 100644
--- a/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/MessagingManager.java
+++ b/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/MessagingManager.java
@@ -59,8 +59,7 @@ import de.fu_berlin.inf.dpp.util.Util;
 public class MessagingManager implements PacketListener, MessageListener,
     IConnectionListener, InvitationListener {
 
-    private static Logger log = Logger.getLogger(MessagingManager.class
-        .getName());
+    private static Logger log = Logger.getLogger(MessagingManager.class);
 
     MessageEventManager messageEventManager;
 
@@ -461,12 +460,9 @@ public class MessagingManager implements PacketListener, MessageListener,
         }
         String user = saros.getConnection().getUser();
         if (this.session == null) {
+            this.multitrans.initMUC(saros.getConnection(), user);
             MultiUserChat muc = this.multitrans.getMUC();
-            if (muc == null) {
-                this.multitrans.initMUC(saros.getConnection(), user);
-                muc = this.multitrans.getMUC();
-            }
-            MessagingManager.log.debug("Creating MUC session..");
+            log.debug("Creating MUC session..");
             this.session = new MultiChatSession(muc);
         } else {
             this.multitrans.getMUC().join(user, multitrans.getRoomPassword());
@@ -474,7 +470,7 @@ public class MessagingManager implements PacketListener, MessageListener,
     }
 
     public void disconnectMultiUserChat() {
-        MessagingManager.log.debug("Leaving MUC session..");
+        log.debug("Leaving MUC session..");
         this.multitrans.getMUC().leave();
     }
 
diff --git a/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/net/internal/MultiUserChatManager.java b/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/net/internal/MultiUserChatManager.java
index 4ae3dc0f5134070468081a01440b863c9ed86399..e2d79c3f5d7f2d83d05be8d1920944cf9d4397ac 100644
--- a/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/net/internal/MultiUserChatManager.java
+++ b/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/net/internal/MultiUserChatManager.java
@@ -66,15 +66,14 @@ public class MultiUserChatManager {
         try {
             // Create the room
             muc.create(user);
-
         } catch (XMPPException e) {
             log.debug(e);
         }
 
-        try {
-            // try to join to room
-            muc.join(user, this.comPrefs.password);
+        // try to join to room
+        muc.join(user, this.comPrefs.password);
 
+        try {
             // Get the the room's configuration form
             Form form = muc.getConfigurationForm();
 
diff --git a/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/ChatView.java b/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/ChatView.java
index 15c3890c0ab26e3014d245109522836f7fb442fa..f9e6877bc951ffd049ae2a31ae01af7c27d6a6cf 100644
--- a/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/ChatView.java
+++ b/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/ChatView.java
@@ -262,7 +262,7 @@ public class ChatView extends ViewPart implements IConnectionListener,
                             .sendMessage("has joined the chat");
                     } catch (XMPPException e) {
                         ChatView.this.viewer.getDocument().set(
-                            "Error: Couldn't connect");
+                            "Error: Couldn't connect - " + e);
                     }
                 }
             }
diff --git a/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/util/CommunicationNegotiatingManager.java b/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/util/CommunicationNegotiatingManager.java
index 610614a62737e50e4dc2b7d32e3463ea93792682..014f405a256ceb10307aeea9c8bd448d0f79d939 100644
--- a/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/util/CommunicationNegotiatingManager.java
+++ b/de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/util/CommunicationNegotiatingManager.java
@@ -150,7 +150,8 @@ public class CommunicationNegotiatingManager {
 
         if (prefs
             .getBoolean(PreferenceConstants.USER_DEFINED_CHATROOM_PASSWORD) == true) {
-            comPrefs.password = prefs.getString(PreferenceConstants.PASSWORD);
+            comPrefs.password = prefs
+                .getString(PreferenceConstants.CHATROOM_PASSWORD);
         } else {
             comPrefs.password = getRandomPassword();
         }