diff --git a/api-server/common/models/user.js b/api-server/common/models/user.js
index d024d83f02..d92514b465 100644
--- a/api-server/common/models/user.js
+++ b/api-server/common/models/user.js
@@ -258,7 +258,7 @@ module.exports = function(User) {
       // is update or save user
       .filter(Boolean)
       .do(user => {
-        // Some old accounts will not have emails associated with theme
+        // Some old accounts will not have emails associated with them
         // we verify only if the email field is populated
         if (user.email && !isEmail(user.email)) {
           throw createEmailError();
@@ -677,7 +677,7 @@ module.exports = function(User) {
           );
         });
     } else {
-      return 'Something unexpected happened whilst updating your email.';
+      return 'Something unexpected happened while updating your email.';
     }
   };
 
@@ -994,7 +994,7 @@ module.exports = function(User) {
         })
         // filter out non objects
         .filter(timestamp => !!timestamp || typeof timestamp === 'object')
-        // filterout timestamps older then an hour
+        // filter out timestamps older than one hour
         .filter(({ timestamp = 0 }) => {
           return timestamp >= browniePoints;
         })