diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
index 510933d2..011742ad 100644
--- a/app/helpers/sessions_helper.rb
+++ b/app/helpers/sessions_helper.rb
@@ -33,7 +33,7 @@ module SessionsHelper
   def check_email_verified(user)
     if user.activated?
       # Get the url to redirect the user to
-      url = if cookies[:return_to] && cookies[:return_to] != root_url
+      url = if cookies[:return_to] && ![root_url, signup_url].include?(cookies[:return_to])
         cookies[:return_to]
       else
         user.main_room