diff --git a/app/models/user.rb b/app/models/user.rb
index 3cb63be..cb2401b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -72,7 +72,7 @@ class User < ActiveRecord::Base
         :activation_code => user.activation_code,
         :environment => user.environment.name,
         :url => user.environment.top_url,
-        :return_to => user.return_to
+        :redirection => (true if user.return_to)
     end
 
     def signup_welcome_email(user)
diff --git a/app/views/user/mailer/activation_code.rhtml b/app/views/user/mailer/activation_code.rhtml
index 7a05794..ac03cc4 100644
--- a/app/views/user/mailer/activation_code.rhtml
+++ b/app/views/user/mailer/activation_code.rhtml
@@ -1,6 +1,6 @@
 <%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
 
-<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => (true if @return_to) ) }) %>
+<%= word_wrap(_('Welcome to %{environment}! To activate your account, follow the link: %{activation_url}') % { :environment => @environment, :activation_url => @url + url_for(:controller => :account, :action => :activate, :activation_code => @activation_code, :redirection => @redirection) }) %>
 
 <%= _("Greetings,") %>
 
--
libgit2 0.21.2