diff --git a/app/controllers/profiles/notifications_controller.rb b/app/controllers/profiles/notifications_controller.rb
index 6ca7537300f..0cca5d1e330 100644
--- a/app/controllers/profiles/notifications_controller.rb
+++ b/app/controllers/profiles/notifications_controller.rb
@@ -1,7 +1,6 @@
 class Profiles::NotificationsController < Profiles::ApplicationController
   def show
     @user = current_user
-    @notification = current_user.notification
     @group_notifications = current_user.notification_settings.for_groups
     @project_notifications = current_user.notification_settings.for_projects
   end
diff --git a/app/models/member.rb b/app/models/member.rb
index 747d0f16d8d..7d5af1d5c8a 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -163,7 +163,7 @@ class Member < ActiveRecord::Base
   end
 
   def create_notification_setting
-    user.notification_setting.find_or_create_for(source)
+    user.notification_settings.find_or_create_for(source)
   end
 
   def notification_setting