5 files changed, 12 insertions, 9 deletions

diff --git a/client/src/app/account/account-settings/account-settings.component.scss b/client/src/app/account/account-settings/account-settings.component.scss
index c8a27dbcd..fbd1cb9f0 100644
--- a/client/src/app/account/account-settings/account-settings.component.scss
+++ b/client/src/app/account/account-settings/account-settings.component.scss
@@ -6,6 +6,7 @@
 
   img {
     @include avatar(50px);
+
     margin-right: 15px;
   }
 
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 8cb94b3dd..ae167cfb6 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -21,10 +21,10 @@ menu {
     margin-bottom: 35px;
 
     img {
+      @include avatar(34px);
+
       margin-left: 20px;
       margin-right: 10px;
-
-      @include avatar(34px);
     }
 
     .logged-in-info {
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 140de1b2c..7bfc93f08 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -110,11 +110,6 @@
   }
 }
 
-@mixin avatar ($size) {
-  width: $size;
-  height: $size;
-}
-
 @mixin icon ($size) {
   display: inline-block;
   background-repeat: no-repeat;
@@ -125,7 +120,6 @@
   cursor: pointer;
 }
 
-
 @mixin peertube-select-container ($width) {
   padding: 0;
   margin: 0;
@@ -267,3 +261,10 @@
   }
 }
 
+
+@mixin avatar ($size) {
+  object-fit: cover;
+  border-radius:50%;
+  width: $size;
+  height: $size;
+}
diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts
index 6c24434f2..d37813595 100644
--- a/server/controllers/api/users.ts
+++ b/server/controllers/api/users.ts
@@ -3,7 +3,7 @@ import { extname, join } from 'path'
 import * as sharp from 'sharp'
 import * as uuidv4 from 'uuid/v4'
 import { UserCreate, UserRight, UserRole, UserUpdate, UserUpdateMe, UserVideoRate as FormattedUserVideoRate } from '../../../shared'
-import { renamePromise, unlinkPromise } from '../../helpers/core-utils'
+import { unlinkPromise } from '../../helpers/core-utils'
 import { retryTransactionWrapper } from '../../helpers/database-utils'
 import { logger } from '../../helpers/logger'
 import { createReqFiles, getFormattedObjects } from '../../helpers/utils'
diff --git a/server/lib/activitypub/process/process-update.ts b/server/lib/activitypub/process/process-update.ts
index a5ad406cb..bc8ae5cc6 100644
--- a/server/lib/activitypub/process/process-update.ts
+++ b/server/lib/activitypub/process/process-update.ts
@@ -65,6 +65,7 @@ async function updateRemoteVideo (actor: ActorModel, activity: ActivityUpdate) {
       videoInstance.set('licence', videoData.licence)
       videoInstance.set('language', videoData.language)
       videoInstance.set('nsfw', videoData.nsfw)
+      videoInstance.set('commentsEnabled', videoData.commentsEnabled)
       videoInstance.set('privacy', videoData.privacy)
       videoInstance.set('description', videoData.description)
       videoInstance.set('duration', videoData.duration)