diff --git a/users/tests/test_views.py b/users/tests/test_views.py
index e69de29..cfbff12 100644
--- a/users/tests/test_views.py
+++ b/users/tests/test_views.py
@@ -0,0 +1,53 @@
+from django.test import TestCase, RequestFactory
+from django.core.urlresolvers import reverse_lazy
+from django.contrib.auth.models import AnonymousUser
+from ..models import User
+from .. import views
+
+class User_Test(TestCase):
+
+	def setUp(self):
+		self.factory = RequestFactory()
+		self.user = User.objects.create(username = 'erik', email = 'egz@cin.ufpe.br', password = 'amadeus')
+		self.admin = User.objects.create_superuser('admin', email = 'admin@amadeus.com', password = 'teste')
+
+	def test_login_get_uauth(self):
+		request = self.factory.get(reverse_lazy('users:login'))
+
+		request.user = AnonymousUser()
+
+		response = views.login(request)
+
+		self.assertEquals(response.status_code, 200)
+
+	def test_login_get_auth(self):
+		request = self.factory.get(reverse_lazy('users:login'))
+
+		request.user = self.user
+
+		response = views.login(request)
+
+		self.assertEquals(response.status_code, 302)
+
+	def test_login_post_ok(self):
+		data = {
+			'email': 'admin@amadeus.com',
+			'password': 'teste'
+		}
+
+		response = self.client.post(reverse_lazy('users:login'), data)
+		
+		self.assertEquals(response.status_code, 302)
+
+	def test_login_post_invalid(self):
+		data = {
+			'email': 'test@amadeus.com.br',
+			'password': 'anything'
+		}
+
+		response = self.client.post(reverse_lazy('users:login'), data)
+
+		messages = response.context['messages']
+
+		self.assertEquals(response.status_code, 200)
+		self.assertIsNotNone(messages) #checking if message was sent
\ No newline at end of file
diff --git a/users/views.py b/users/views.py
index 6b679ce..c70f0df 100644
--- a/users/views.py
+++ b/users/views.py
@@ -424,14 +424,14 @@ class PasswordResetConfirmView(generic.FormView):
 				user.set_password(new_password)
 				user.save()
                 
-				messages.success(request, 'Password reset successfully.')
+				messages.success(request, _('Password reset successfully.'))
                 
 				return self.form_valid(form)
 			else:
-				messages.error(request, 'We were not able to reset your password.')
+				messages.error(request, _('We were not able to reset your password.'))
 				return self.form_invalid(form)
 		else:
-			messages.error(request,'The reset password link is no longer valid.')
+			messages.error(request, _('The reset password link is no longer valid.'))
 			return self.form_invalid(form)
 
 
@@ -447,7 +447,7 @@ def login(request):
 			login_user(request, user)
 			return redirect(reverse("home"))
 		else:
-			messages.add_message(request, messages.ERROR, _('E-mail or password are incorrect.'))
+			messages.error(request, _('E-mail or password are incorrect.'))
 			context["username"] = username
 	elif request.user.is_authenticated:
 		return redirect(reverse('home'))
--
libgit2 0.21.2