diff --git a/index.html b/index.html
index b4160f35a..8dd57c46d 100644
--- a/index.html
+++ b/index.html
@@ -126,10 +126,12 @@
           <video ng-if="$root.videoInfo[c.peerId]" 
             avatar peer="{{c}}"
             autoplay
+            ng-class="($root.wallet.getOnlinePeerIDs().indexOf(c.peerId) != -1) ? 'online' : 'offline'"
             ng-src="{{$root.getVideoURL(c.peerId)}}"
           ></video>
           <img ng-if="!$root.videoInfo[c.peerId]" 
             avatar peer="{{c}}"
+            ng-class="($root.wallet.getOnlinePeerIDs().indexOf(c.peerId) != -1) ? 'online' : 'offline'"
             src="./img/satoshi.gif" 
           />
           <span ng-if="c.nick" style="position:absolute; bottom:-10px; width: 80px; overflow: hidden;">{{c.nick}}</span>
diff --git a/js/directives.js b/js/directives.js
index bbda156d6..78124f461 100644
--- a/js/directives.js
+++ b/js/directives.js
@@ -95,9 +95,8 @@ angular.module('copay.directives')
         var peer = JSON.parse(attrs.peer)
         var peerId = peer.peerId;
         var nick = peer.nick;
-        element.addClass(($rootScope.wallet.getOnlinePeerIDs().indexOf(peerId) != -1) ? 'online' : 'offline');
         element.addClass('video-small');
-        element.attr('title', peerId + (peerId == $rootScope.wallet.network.peerId?' (You)':''));
+        element.attr('title', peerId + (peerId == $rootScope.wallet.network.peerId ? ' (You)' : ''));
         var muted = $rootScope.getVideoMutedStatus(peerId);
         if (muted) {
           element.attr("muted", true);