diff --git a/base/views.py b/base/views.py
index 9ee21b2c4..2e801a3c5 100644
--- a/base/views.py
+++ b/base/views.py
@@ -65,4 +65,3 @@ class CasaLegislativaTableAuxView(FormView):
 
     def get_success_url(self):
         return reverse('base:casa_legislativa')
-
diff --git a/sapl/settings.py b/sapl/settings.py
index b3361ae9c..1673ebf84 100644
--- a/sapl/settings.py
+++ b/sapl/settings.py
@@ -31,6 +31,7 @@ DEBUG = config('DEBUG', default=False, cast=bool)
 ALLOWED_HOSTS = ['*']
 
 LOGIN_REDIRECT_URL = '/'
+LOGIN_URL = '/login/?next='
 
 # SAPL business apps in dependency order
 SAPL_APPS = (
diff --git a/templates/base/login.html b/templates/base/login.html
index f167217aa..e091ef5a3 100644
--- a/templates/base/login.html
+++ b/templates/base/login.html
@@ -2,11 +2,6 @@
 {% load i18n %}
 {% block base_content %}
 
-  {% if form.errors %}
-
-    <p>Usuário e/ou Senha inexistente. Tente novamente.</p>
-  {% endif %}
-
   {% if next %}
     {% if user.is_authenticated %}
       <p>Você não tem acesso a esta página. Se quiser continuar, faça o Login.</p>
@@ -30,6 +25,11 @@
 
                           <p class="bs-component">
                               <table>
+                                {% if form.errors %}
+                                  <div class="alert alert-danger">Usuário e/ou Senha inexistente.
+                                  </div>
+
+                                {% endif %}
                                   <tr>
                                       <td><b>Usuário</b></td>
                                       <td>{{ form.username }}</td>