diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index a42f4233c42..c524939435b 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -71,7 +71,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
         type: 'POST'
       }).then(function (result) {
         // Successful login
-        if (result.error) {
+        if (result && result.error) {
           self.set('loggingIn', false);
           if (result.reason === 'not_activated') {
             self.send('showNotActivated', {