diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb
index c93b61c80..6700785e5 100644
--- a/app/controllers/users/sessions_controller.rb
+++ b/app/controllers/users/sessions_controller.rb
@@ -1,11 +1,18 @@
 class Users::SessionsController < Devise::SessionsController
 
   def after_sign_in_path_for(resource)
-    if resource.show_welcome_screen?
+    if stored_path_allows_welcome_screen? && resource.show_welcome_screen?
       welcome_path
     else
       root_path
     end
   end
 
+  private
+
+    def stored_path_allows_welcome_screen?
+      stored_path = session[stored_location_key_for(resource)]
+      stored_path[0..5] != "/email"
+    end
+
 end