diff --git a/config/passport.js b/config/passport.js
index 8e26e7e3ee..a4f622c520 100644
--- a/config/passport.js
+++ b/config/passport.js
@@ -22,6 +22,23 @@ passport.deserializeUser(function(id, done) {
     });
 });
 
+function sendWelcomeEmail(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 ' + user.name + '!',
+        text: 'Hello,\n\n' +
+        'Welcome to Free Code Camp!'
+    };
+}
+
 /**
  * OAuth Strategy Overview
  *
@@ -265,6 +282,9 @@ passport.use(new GoogleStrategy(secrets.google, function(req, accessToken, refre
                 user.save(function(err) {
                     done(err, user);
                 });
+                if (!existingEmailUser) {
+                    sendWelcomeEmail(user);
+                }
             });
         });
     }
diff --git a/controllers/user.js b/controllers/user.js
index ad116b97a8..dde1270724 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -68,7 +68,7 @@ exports.logout = function(req, res) {
 exports.getEmailSignin = function(req, res) {
   if (req.user) return res.redirect('/');
   res.render('account/email-signup', {
-    title: 'Create Your Free Code Camp Account'
+    title: 'Sign in to your Free Code Camp Account'
   });
 };