1 files changed, 14 insertions, 0 deletions
diff --git a/app/models/principal.rb b/app/models/principal.rb
index 37d2a545d..8b46c7ff9 100644
--- a/app/models/principal.rb
+++ b/app/models/principal.rb
@@ -32,6 +32,8 @@ class Principal < ActiveRecord::Base
     }
   }
   
+  before_create :set_default_empty_values
+  
   def <=>(principal)
     if self.class.name == principal.class.name
       self.to_s.downcase <=> principal.to_s.downcase
@@ -40,4 +42,16 @@ class Principal < ActiveRecord::Base
       principal.class.name <=> self.class.name
     end
   end
+  
+  protected
+  
+  # Make sure we don't try to insert NULL values (see #4632)
+  def set_default_empty_values
+    self.login ||= ''
+    self.hashed_password ||= ''
+    self.firstname ||= ''
+    self.lastname ||= ''
+    self.mail ||= ''
+    true
+  end
 end