diff --git a/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceUtils.java b/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceUtils.java
index 74ea0cd0f..f2ad0b5ae 100644
--- a/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceUtils.java
+++ b/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceUtils.java
@@ -203,7 +203,9 @@ public static List<String> joinRoom(MultiUserChat groupChat, Resourcepart nickna
                     error = ( (XMPPException.XMPPErrorException) ex ).getStanzaError();
                 }
 
-                final String errorText = ConferenceUtils.getReason( error );
+                String errorText = Res.getString("title.join.conference.room");
+                if (groupChat.getRoom() != null) { errorText += " " + groupChat.getRoom();  }
+                errorText += ": " + ConferenceUtils.getReason( error );
                 errors.add( errorText );
             }
         }
diff --git a/core/src/main/java/org/jivesoftware/spark/ui/conferences/JoinRoomSwingWorker.java b/core/src/main/java/org/jivesoftware/spark/ui/conferences/JoinRoomSwingWorker.java
index 4c21f8c3b..1f022ec36 100644
--- a/core/src/main/java/org/jivesoftware/spark/ui/conferences/JoinRoomSwingWorker.java
+++ b/core/src/main/java/org/jivesoftware/spark/ui/conferences/JoinRoomSwingWorker.java
@@ -206,7 +206,10 @@ public Object construct()
                 }
             }
 
-            final String errorText = ConferenceUtils.getReason( error );
+            String errorText = Res.getString("title.join.conference.room");
+            errorText += " " + roomJID;
+            errorText += ": " + ConferenceUtils.getReason( error );
+
             errors.add( errorText );
             return null;
         }