diff --git a/config/passport.js b/config/passport.js
index 1f2ebe8037faeb..799ee1f83b12d5 100644
--- a/config/passport.js
+++ b/config/passport.js
@@ -82,6 +82,7 @@ passport.use(new FacebookStrategy(secrets.facebook, function(req, accessToken, r
     User.findOne({ facebook: profile.id }, function(err, existingUser) {
       if (existingUser) return done(null, existingUser);
       User.findOne({ email: profile._json.email }, function(err, existingEmailUser) {
+        if (err) { return done(err); }
         if (existingEmailUser) {
           req.flash('errors', { msg: 'There is already an account using this email address. Sign in to that account and link it with Facebook manually from Account Settings.' });
           done();
@@ -96,29 +97,29 @@ passport.use(new FacebookStrategy(secrets.facebook, function(req, accessToken, r
           user.profile.location = (profile._json.location) ? profile._json.location.name : '';
           user.save(function(err) {
             done(err, user);
-          });
-          var transporter = nodemailer.createTransport({
-            service: 'Mandrill',
-            auth: {
-              user: secrets.mandrill.user,
-              pass: secrets.mandrill.password
-            }
-          });
-          var mailOptions = {
-            to: user.email,
-            from: 'Team@freecodecamp.com',
-            subject: 'Welcome to Free Code Camp!',
-            text: [
-              'Greetings from San Francisco!\n\n',
-              'Thank you for joining our community.\n',
-              'Feel free to email us at this address if you have any questions about Free Code Camp.\n',
-              "And if you have a moment, check out our blog: blog.freecodecamp.com.\n",
-              'Good luck with the challenges!\n\n',
-              '- Our All-Volunteer Team'
-            ].join('')
-          };
-          transporter.sendMail(mailOptions, function(err) {
-            if (err) { return err; }
+            var transporter = nodemailer.createTransport({
+              service: 'Mandrill',
+              auth: {
+                user: secrets.mandrill.user,
+                pass: secrets.mandrill.password
+              }
+            });
+            var mailOptions = {
+              to: user.email,
+              from: 'Team@freecodecamp.com',
+              subject: 'Welcome to Free Code Camp!',
+              text: [
+                'Greetings from San Francisco!\n\n',
+                'Thank you for joining our community.\n',
+                'Feel free to email us at this address if you have any questions about Free Code Camp.\n',
+                "And if you have a moment, check out our blog: blog.freecodecamp.com.\n",
+                'Good luck with the challenges!\n\n',
+                '- Our All-Volunteer Team'
+              ].join('')
+            };
+            transporter.sendMail(mailOptions, function(err) {
+              if (err) { return err; }
+            });
           });
         }
       });
diff --git a/controllers/story.js b/controllers/story.js
index 1ec16fc9d2a98e..be62c54b4c3dfd 100644
--- a/controllers/story.js
+++ b/controllers/story.js
@@ -142,7 +142,7 @@ exports.returnIndividualStory = function(req, res, next) {
         try {
             var votedObj = story.upVotes.filter(function(a){
                 return a['upVotedByUsername'] === req.user['profile']['username'];
-            })
+            });
             if (votedObj.length > 0){
                 userVoted = true;
             }
@@ -314,7 +314,7 @@ exports.storySubmission = function(req, res) {
         }
 
         // if duplicate storyLink add unique number
-        storyLink = (storyCount == 0) ? storyLink : storyLink + ' ' + storyCount;
+        storyLink = (storyCount === 0) ? storyLink : storyLink + ' ' + storyCount;
 
         var link = data.link;
         if (link.search(/^https?:\/\//g) === -1) {
diff --git a/controllers/user.js b/controllers/user.js
index 20fda23b1a1194..bd0a0cb326ad79 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -153,34 +153,34 @@ exports.postEmailSignup = function(req, res, next) {
 
             user.save(function(err) {
                 if (err) { return next(err); }
+                var transporter = nodemailer.createTransport({
+                    service: 'Mandrill',
+                    auth: {
+                        user: secrets.mandrill.user,
+                        pass: secrets.mandrill.password
+                    }
+                });
+                var mailOptions = {
+                    to: user.email,
+                    from: 'Team@freecodecamp.com',
+                    subject: 'Welcome to Free Code Camp!',
+                    text: [
+                        'Greetings from San Francisco!\n\n',
+                        'Thank you for joining our community.\n',
+                        'Feel free to email us at this address if you have any questions about Free Code Camp.\n',
+                        "And if you have a moment, check out our blog: blog.freecodecamp.com.\n",
+                        'Good luck with the challenges!\n\n',
+                        '- Our All-Volunteer Team'
+                    ].join('')
+                };
+                transporter.sendMail(mailOptions, function(err) {
+                    if (err) { return err; }
+                });
                 req.logIn(user, function(err) {
                     if (err) { return next(err); }
                     res.redirect('/email-signup');
                 });
             });
-            var transporter = nodemailer.createTransport({
-                service: 'Mandrill',
-                auth: {
-                    user: secrets.mandrill.user,
-                    pass: secrets.mandrill.password
-                }
-            });
-            var mailOptions = {
-                to: user.email,
-                from: 'Team@freecodecamp.com',
-                subject: 'Welcome to Free Code Camp!',
-                text: [
-                    'Greetings from San Francisco!\n\n',
-                    'Thank you for joining our community.\n',
-                    'Feel free to email us at this address if you have any questions about Free Code Camp.\n',
-                    "And if you have a moment, check out our blog: blog.freecodecamp.com.\n",
-                    'Good luck with the challenges!\n\n',
-                    '- the Volunteer Camp Counselor Team'
-                ].join('')
-            };
-            transporter.sendMail(mailOptions, function(err) {
-                if (err) { return err; }
-            });
         });
     });
 };