diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rb
index ef9f5185d..412dd7fd1 100644
--- a/app/controllers/invitations_controller.rb
+++ b/app/controllers/invitations_controller.rb
@@ -82,7 +82,7 @@ class InvitationsController < Devise::InvitationsController
 
   def email
     @invs = []
-    @resource = User.find_by_invitation_token(params[:invitation_token]) 
+    @resource = User.find_by_invitation_token(params[:invitation_token])
     render 'devise/mailer/invitation_instructions', :layout => false
   end
   protected
diff --git a/app/views/devise/mailer/invitation_instructions.html.haml b/app/views/devise/mailer/invitation_instructions.html.haml
index 7ad3def60..fc24f2d92 100644
--- a/app/views/devise/mailer/invitation_instructions.html.haml
+++ b/app/views/devise/mailer/invitation_instructions.html.haml
@@ -1,3 +1,4 @@
+- @invs = @resource.invitations_to_me
 -if @invs.count > 0
   !!!
   %html
@@ -8,7 +9,6 @@
       %header
         = image_tag AppConfig[:pod_url] + 'images/logo_caps.png'
       #container
-        - @invs = @resource.invitations_to_me
         %p
           = t('devise.mailer.welcome', :email => @resource.email)
         = render :partial => 'inviters'
diff --git a/spec/models/invitation_spec.rb b/spec/models/invitation_spec.rb
index 929868ad6..c21195247 100644
--- a/spec/models/invitation_spec.rb
+++ b/spec/models/invitation_spec.rb
@@ -264,7 +264,7 @@ describe Invitation do
     context 'with no inviter' do
       it 'sends an email that includes the right things' do
         Invitation.create_invitee(:service => 'email', :identifier => @email)
-        Devise.mailer.deliveries.first.to_s.should include("Welcome #{@email}")
+        Devise.mailer.deliveries.first.to_s.should include("Email not displaying correctly?")
       end
       it 'creates a user' do
         expect {