diff --git a/app/builders/saml_user_builder.rb b/app/builders/saml_user_builder.rb
index a062b6943..d227d6c62 100644
--- a/app/builders/saml_user_builder.rb
+++ b/app/builders/saml_user_builder.rb
@@ -14,11 +14,21 @@ class SamlUserBuilder
 
   def find_or_create_user
     user = User.from_email(email)
-    return user if user
+
+    if user
+      convert_existing_user_to_saml(user)
+      return user
+    end
 
     create_user
   end
 
+  def convert_existing_user_to_saml(user)
+    return if user.saml_user?
+
+    user.convert_to_saml!
+  end
+
   def create_user
     user = User.new(user_params)