diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index 833168da6e7..46c1085f3d4 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -27,7 +27,12 @@ class SessionController < ApplicationController
           render_serialized(@user, UserSerializer)
           return
         else
-          render json: {error: I18n.t("login.not_activated"), reason: 'not_activated', sent_to_email: @user.email_logs.where(email_type: 'signup').order('created_at DESC').first.try(:to_address), current_email: @user.email}
+          render json: {
+            error: I18n.t("login.not_activated"),
+            reason: 'not_activated',
+            sent_to_email: @user.email_logs.where(email_type: 'signup').order('created_at DESC').first.try(:to_address) || @user.email,
+            current_email: @user.email
+          }
           return
         end
       end