diff --git a/app/models/principal.rb b/app/models/principal.rb
index 58a08b19e..c7addd9df 100644
--- a/app/models/principal.rb
+++ b/app/models/principal.rb
@@ -152,10 +152,9 @@ class Principal < ActiveRecord::Base
     return nil if keyword.blank?
 
     principal = nil
-    principal ||= principals.detect {|a|
-                               keyword.casecmp(a.mail.to_s) == 0 ||
-                                 keyword.casecmp(a.login.to_s) == 0
-                             }
+    principal ||= principals.detect {|a| keyword.casecmp(a.login.to_s) == 0}
+    principal ||= principals.detect {|a| keyword.casecmp(a.mail.to_s) == 0}
+
     if principal.nil? && keyword.match(/ /)
       firstname, lastname = *(keyword.split) # "First Last Throwaway"
       principal ||= principals.detect {|a|