diff --git a/.gitignore b/.gitignore
index c5f7c47..f7bacf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,8 +30,8 @@
 
 # Ignore some of the initializers
 config/initializers/recaptcha.rb
-#config/initializers/devise.rb
-#config/initializers/contact_us.rb
+config/initializers/devise.rb
+config/initializers/wicked_pdf.rb
 
 # Ignore enviroments settings
 #config/environments/development.rb
diff --git a/app/models/user.rb b/app/models/user.rb
index af4b05b..32813fc 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -284,8 +284,8 @@
     if scheme.nil?
       throw Exception.new('Unknown OAuth provider: ' + auth.provider)
     else
-      joins(:user_identifiers).where(identifier: auth.uid, 
-                                     identifier_scheme: scheme).first_or_create do |user|
+      joins(:user_identifiers).where('user_identifiers.identifier': auth.uid, 
+           'user_identifiers.identifier_scheme_id': scheme.id).first_or_create do |user|
         user.email = auth.info.email
         user.password = Devise.friendly_token[0, 20]
       end