From 03aadebf558b17f0e2ea0f5a40dcfd773be63e33 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 11 Jun 2014 12:30:30 -0700
Subject: [PATCH] followup to 4acfc5c6

---
 packages/accounts-password/password_server.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index 396beff8e6..a0fbc5b504 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -331,7 +331,7 @@ Accounts.sendResetPasswordEmail = function (userId, email) {
     "services.password.reset": tokenRecord
   }});
   // before passing to template, update user object with new token
-  user.services.password.reset = tokenRecord;
+  Meteor._ensure(user, 'services', 'password').reset = tokenRecord;
 
   var resetPasswordUrl = Accounts.urls.resetPassword(token);
 
@@ -382,7 +382,7 @@ Accounts.sendEnrollmentEmail = function (userId, email) {
     "services.password.reset": tokenRecord
   }});
   // before passing to template, update user object with new token
-  user.services.password.reset = tokenRecord;
+  Meteor._ensure(user, 'services', 'password').reset = tokenRecord;
 
   var enrollAccountUrl = Accounts.urls.enrollAccount(token);
 
@@ -507,6 +507,10 @@ Accounts.sendVerificationEmail = function (userId, address) {
     {_id: userId},
     {$push: {'services.email.verificationTokens': tokenRecord}});
   // before passing to template, update user object with new token
+  Meteor._ensure(user, 'services', 'email');
+  if (!user.services.email.verificationTokens) {
+    user.services.email.verificationTokens = [];
+  }
   user.services.email.verificationTokens.push(tokenRecord);
 
   var verifyEmailUrl = Accounts.urls.verifyEmail(tokenRecord.token);