diff --git a/app/models/user.rb b/app/models/user.rb
index 684a11ca40c16393bc75a93844d3d55e91094afa..f86024e3a2b37646bc349d622c621b6510528228 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -48,11 +48,12 @@ class User < ActiveRecord::Base
 
   def update_user_preferences(pref_hash)
     if self.disable_mail
-      mails = ['mentioned', 'request_received', 'comment_on_post', 'request_acceptence', 'also_commented', 'private_message']
+      mails = ['mentioned', 'request_received', 'comment_on_post', 'request_acceptance', 'also_commented', 'private_message']
       mails.each{|x| self.user_preferences.find_or_create_by_email_type(x)}
-      self.update_attributes(:disable_mail => false)
+      self.disable_mail = false
+      self.save
     end
-
+    
     pref_hash.keys.each do |key|
       if pref_hash[key] == 'true'
         self.user_preferences.find_or_create_by_email_type(key)
@@ -179,9 +180,7 @@ class User < ActiveRecord::Base
   ######### Mailer #######################
   def mail(job, *args)
     pref = job.to_s.gsub('Job::Mail', '').underscore
-    puts pref
     unless self.disable_mail || self.user_preferences.exists?(:email_type => pref)
-      puts 'im mailin'
       Resque.enqueue(job, *args)
     end
   end
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 9584d13e43aeb053897eaedf98ed286c7b34965e..779b0bebb0168f22eacfd15d60ce16229a97daae 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -1,3 +1,21 @@
 class UserPreference < ActiveRecord::Base
   belongs_to :user
+
+  validate :must_be_valid_email_type
+  
+
+  def must_be_valid_email_type
+    unless valid_email_types.include?(self.email_type)
+      errors.add(:email_type, 'supplied mail type is not a valid or known email type')
+    end
+  end
+
+  def valid_email_types
+    ["mentioned",
+   "comment_on_post",
+   "private_message",
+   "request_acceptence",
+   "request_received",
+   "also_commented"]
+  end
 end
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 8170f6ef928c48fdd32108d23a231e76754bea03..0d9660666fa3ee23f7ffed80db7c45392b2179e4 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -106,7 +106,7 @@
         %br
         %p.checkbox_select
           = type.label t('.request_acceptence') 
-          = type.check_box :request_acceptence, {:checked =>  @email_prefs['request_acceptance']}, false, true 
+          = type.check_box :request_acceptance, {:checked =>  @email_prefs['request_acceptance']}, false, true 
 
     %br
     = f.submit t('.change')
diff --git a/spec/models/user_preference_spec.rb b/spec/models/user_preference_spec.rb
index 66613b87dad8e53dc6f319c2168b1775ebae4fbd..daee7233d22a6eb75788eaaea4c178d7ef4f31e8 100644
--- a/spec/models/user_preference_spec.rb
+++ b/spec/models/user_preference_spec.rb
@@ -1,5 +1,10 @@
 require 'spec_helper'
 
 describe UserPreference do
-  pending "add some examples to (or delete) #{__FILE__}"
+
+  it 'should only allow valid email types to exist' do
+    pref = alice.user_preferences.new(:email_type => 'not_valid')
+    puts pref.inspect
+    pref.should_not be_valid
+  end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index fa05afd7209a7c06ccde83e07793c0a7cad8795c..e0afcde49693eee3080c4ecd9c3994f4a56a7c12 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -228,8 +228,8 @@ describe User do
       proc {
         alice.update_user_preferences({'mentioned' => false})
       }.should change(alice.user_preferences, :count).by(5)
+      alice.reload.disable_mail.should be_false
     end
-
   end
 
   describe ".find_for_authentication" do