diff --git a/services/web/app/coffee/Features/Email/EmailBuilder.coffee b/services/web/app/coffee/Features/Email/EmailBuilder.coffee
index 4f3db645a9..2ff07c3864 100644
--- a/services/web/app/coffee/Features/Email/EmailBuilder.coffee
+++ b/services/web/app/coffee/Features/Email/EmailBuilder.coffee
@@ -125,7 +125,7 @@ templates.verifyEmailToJoinTeam =
 	type:"notification"
 	plainTextTemplate: _.template """
 
-Please click the button below to join the team and enjoy the benefits of an upgraded  <%= settings.appName %> account.
+Please click the button below to join the team and enjoy the benefits of an upgraded  <%= appName %> account.
 
 <%= acceptInviteUrl %>
 
diff --git a/services/web/app/coffee/Features/Subscription/TeamInvitesHandler.coffee b/services/web/app/coffee/Features/Subscription/TeamInvitesHandler.coffee
index e913e9a16c..c28546ffb3 100644
--- a/services/web/app/coffee/Features/Subscription/TeamInvitesHandler.coffee
+++ b/services/web/app/coffee/Features/Subscription/TeamInvitesHandler.coffee
@@ -86,12 +86,15 @@ createInvite = (subscription, email, inviterName, callback) ->
 		invite = subscription.teamInvites.find (invite) -> invite.email == email
 
 		if !invite?
-			invite ||= { email: email }
+			invite = {
+				email: email
+				inviterName: inviterName
+				token: crypto.randomBytes(32).toString("hex")
+				sentAt: new Date()
+			}
 			subscription.teamInvites.push(invite)
-
-		invite.inviterName = inviterName
-		invite.token  = crypto.randomBytes(32).toString("hex")
-		invite.sentAt = new Date()
+		else
+			invite.sentAt = new Date()
 
 		subscription.save (error) ->
 			return callback(error) if error?
@@ -100,6 +103,7 @@ createInvite = (subscription, email, inviterName, callback) ->
 				to: email
 				inviterName: inviterName
 				acceptInviteUrl: "#{settings.siteUrl}/subscription/invites/#{invite.token}/"
+				appName: settings.appName
 			EmailHandler.sendEmail "verifyEmailToJoinTeam", opts, (error) ->
 				return callback(error, invite)
 
diff --git a/services/web/test/unit/coffee/Subscription/TeamInvitesHandlerTests.coffee b/services/web/test/unit/coffee/Subscription/TeamInvitesHandlerTests.coffee
index 3612ebcacd..84069edcaf 100644
--- a/services/web/test/unit/coffee/Subscription/TeamInvitesHandlerTests.coffee
+++ b/services/web/test/unit/coffee/Subscription/TeamInvitesHandlerTests.coffee
@@ -127,7 +127,6 @@ describe "TeamInvitesHandler", ->
 				expect(@subscription.teamInvites).to.deep.include invite
 
 				expect(invite.email).to.eq originalInvite.email
-				expect(invite.token).not.to.eq originalInvite.token
 
 				@subscription.save.calledOnce.should.eq true