diff --git a/.gitignore b/.gitignore
index ec16439..16f0a9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@ capybara-*.html
 dump.rdb
 *.ids
 .rbenv-version
+.ruby-gemset
+.ruby-version
diff --git a/lib/two_factor_authentication/controllers/helpers.rb b/lib/two_factor_authentication/controllers/helpers.rb
index a622dde..505ca01 100644
--- a/lib/two_factor_authentication/controllers/helpers.rb
+++ b/lib/two_factor_authentication/controllers/helpers.rb
@@ -21,7 +21,7 @@ module TwoFactorAuthentication
 
       def handle_failed_second_factor(scope)
         if request.format.present? and request.format.html?
-          session["#{scope}_return_to"] = "#{request.path}?#{request.query_string}" if request.get?
+          session["#{scope}_return_to"] = request.original_fullpath if request.get?
           redirect_to two_factor_authentication_path_for(scope)
         else
           render nothing: true, status: :unauthorized