2 files changed, 7 insertions, 4 deletions

diff --git a/shared/models/users/user-notification-setting.model.ts b/shared/models/users/user-notification-setting.model.ts
index f580e827e..531e12bba 100644
--- a/shared/models/users/user-notification-setting.model.ts
+++ b/shared/models/users/user-notification-setting.model.ts
@@ -1,8 +1,7 @@
 export enum UserNotificationSettingValue {
-  NONE = 1,
-  WEB_NOTIFICATION = 2,
-  EMAIL = 3,
-  WEB_NOTIFICATION_AND_EMAIL = 4
+  NONE = 0,
+  WEB = 1 << 0,
+  EMAIL = 1 << 1
 }
 
 export interface UserNotificationSetting {
diff --git a/shared/models/users/user-notification.model.ts b/shared/models/users/user-notification.model.ts
index 9dd4f099f..f41b6f534 100644
--- a/shared/models/users/user-notification.model.ts
+++ b/shared/models/users/user-notification.model.ts
@@ -2,11 +2,15 @@ export enum UserNotificationType {
   NEW_VIDEO_FROM_SUBSCRIPTION = 1,
   NEW_COMMENT_ON_MY_VIDEO = 2,
   NEW_VIDEO_ABUSE_FOR_MODERATORS = 3,
+
   BLACKLIST_ON_MY_VIDEO = 4,
   UNBLACKLIST_ON_MY_VIDEO = 5,
+
   MY_VIDEO_PUBLISHED = 6,
+
   MY_VIDEO_IMPORT_SUCCESS = 7,
   MY_VIDEO_IMPORT_ERROR = 8,
+
   NEW_USER_REGISTRATION = 9,
   NEW_FOLLOW = 10,
   COMMENT_MENTION = 11