diff --git a/app/widgets/Roster/Roster.php b/app/widgets/Roster/Roster.php
index aebab2683..78d7a70f3 100644
--- a/app/widgets/Roster/Roster.php
+++ b/app/widgets/Roster/Roster.php
@@ -171,7 +171,7 @@ class Roster extends WidgetBase
         if($type == 'bot')
             $html .= '<div class="infoicon bot"></div>';
 
-        if($jingle_video )
+        if($jingle_video && $jingle_ice && $jingle_audio)
             $html .= '<div class="infoicon jingle" onclick="Popup.open(\''.$contact->jid.'/'.$contact->ressource.'\')"></div>';
 
         if(($contact->tuneartist != null && $contact->tuneartist != '') ||
diff --git a/lib/JingletoSDP.php b/lib/JingletoSDP.php
index e28027dd5..bc6e59d49 100644
--- a/lib/JingletoSDP.php
+++ b/lib/JingletoSDP.php
@@ -18,6 +18,7 @@ class JingletoSDP {
 
     function generate() {
         $username = current(explode('@', $this->jingle->attributes()->initiator));
+        $username = $username? $username : "-";
         $sessid   = $this->jingle->attributes()->sid;
         $this->values['session_id']   = substr(base_convert($sessid, 30, 10), 0, 6);