Merge branch 'master' into 15558-alternate-email-addresses

[arvados.git] / services / api / app / models / user.rb

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index 9526f6593308da0e3700d0be2c417e248dfa361f..8ab8ea1d85b0146f692993a8cd1fb6199addc8fc 100644 (file)
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -393,10 +393,10 @@ class User < ArvadosModel
                               :is_active => Rails.configuration.Users.NewUsersAreActive)
 
       primary_user.set_initial_username(requested: info['username']) if info['username']
+      primary_user.identity_url = info['identity_url'] if identity_url
     end
 
     primary_user.email = info['email'] if info['email']
-    primary_user.identity_url = info['identity_url'] if identity_url
     primary_user.first_name = info['first_name'] if info['first_name']
     primary_user.last_name = info['last_name'] if info['last_name']