X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fba452e1092543f9bbc1fd6b2c87ae9288134b15..a6b9fb8166440eef3144150024a875c858db9bb6:/services/api/app/models/user.rb

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index 7cc7cc491c..4d7b2bbaeb 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -31,8 +31,8 @@ class User < ArvadosModel
   after_update :setup_on_activate
 
   before_create :check_auto_admin
-  before_create :set_initial_username, :if => Proc.new {
-    email
+  before_validation :set_initial_username, :if => Proc.new {
+    new_record? && email
   }
   before_create :active_is_not_nil
   after_create :after_ownership_change