diff --git a/app/assets/javascripts/discourse/components/notification-item.js.es6 b/app/assets/javascripts/discourse/components/notification-item.js.es6
index 0b4e3695e5f..a13cd0d5d6c 100644
--- a/app/assets/javascripts/discourse/components/notification-item.js.es6
+++ b/app/assets/javascripts/discourse/components/notification-item.js.es6
@@ -5,7 +5,15 @@ export default Ember.Component.extend({
   classNameBindings: ['notification.read', 'notification.is_warning'],
 
   scope: function() {
-    return "notifications." + this.site.get("notificationLookup")[this.get("notification.notification_type")];
+    var notificationType = this.get("notification.notification_type");
+    var lookup = this.site.get("notificationLookup");
+    var name = lookup[notificationType];
+
+    if (name === "custom") {
+      return this.get("notification.data.message");
+    } else {
+      return "notifications." + name;
+    }
   }.property("notification.notification_type"),
 
   url: function() {
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 3c0565907fb..884ddaff82d 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -31,7 +31,7 @@ class Notification < ActiveRecord::Base
     @types ||= Enum.new(
       :mentioned, :replied, :quoted, :edited, :liked, :private_message,
       :invited_to_private_message, :invitee_accepted, :posted, :moved_post,
-      :linked, :granted_badge, :invited_to_topic
+      :linked, :granted_badge, :invited_to_topic, :custom
     )
   end