diff --git a/lib/noosfero/api/session.rb b/lib/noosfero/api/session.rb
index 90c66d1..a23d472 100644
--- a/lib/noosfero/api/session.rb
+++ b/lib/noosfero/api/session.rb
@@ -15,7 +15,7 @@ module Noosfero
       post "/login" do
         begin
           user ||= User.authenticate(params[:login], params[:password], environment)
-        rescue NoosferoExceptions::UserNotActivated => e
+        rescue User::UserNotActivated => e
           render_api_error!(e.message, 401)
         end
 
diff --git a/test/api/session_test.rb b/test/api/session_test.rb
index bae3d4a..f91ea09 100644
--- a/test/api/session_test.rb
+++ b/test/api/session_test.rb
@@ -20,6 +20,13 @@ class SessionTest < ActiveSupport::TestCase
     assert_equal 401, last_response.status
   end
 
+  should 'return 401 when login with an user that was not activated' do
+    user.deactivate
+    params = {:login => "testapi", :password => "testapi"}
+    post "/api/v1/login?#{params.to_query}"
+    assert_equal 401, last_response.status
+  end
+
   should 'register a user' do
     Environment.default.enable('skip_new_user_email_confirmation')
     params = {:login => "newuserapi", :password => "newuserapi", :password_confirmation => "newuserapi", :email => "newuserapi@email.com" }
--
libgit2 0.21.2