X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/2fbe78e290a7b405067fddb52cad684fa5c8f3ba..af840c52358dc9fa8378194b2c05872dcd50dd69:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index eca592d..728ca16 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -72,7 +72,7 @@ class User < ActiveRecord::Base
       # Stolen from http://www.regular-expressions.info/email.html
       errors.add(:email, "is not valid") unless email  =~
                   /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i
-      errors.add(:login, "should not begin or end with spaces") if login.strip!
+      errors.add(:login, "should not begin or end with spaces") if login and login.strip!
       errors.add(:login, "should contain only letters, numbers, and spaces") unless login =~ /^[A-Za-z0-9 ]*$/
     end
 end