diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index ec885989bc..10a411aea9 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -57,10 +57,10 @@ module.exports = React.createClass({
         }
     },
 
-    onConferenceNotificationClick: function() {
+    onConferenceNotificationClick: function(type) {
         dis.dispatch({
             action: 'place_call',
-            type: "video",
+            type: type,
             room_id: this.props.room.roomId,
         });
     },
@@ -85,14 +85,19 @@ module.exports = React.createClass({
 
         var conferenceCallNotification = null;
         if (this.props.displayConfCallNotification) {
-            var supportedText;
+            var supportedText, joinText;
             if (!MatrixClientPeg.get().supportsVoip()) {
                 supportedText = " (unsupported)";
             }
+            else {
+                joinText = (<span>
+                    Join as <a onClick={this.onConferenceNotificationClick.bind(this, 'voice')} href="#">voice</a> or <a onClick={this.onConferenceNotificationClick.bind(this, 'video')} href="#">video</a>.
+                </span>);
+
+            }
             conferenceCallNotification = (
-                <div className="mx_RoomView_ongoingConfCallNotification"
-                        onClick={this.onConferenceNotificationClick}>
-                    Ongoing conference call {supportedText}
+                <div className="mx_RoomView_ongoingConfCallNotification">
+                    Ongoing conference call{ supportedText }. { joinText }
                 </div>
             );
         }