diff --git a/base/forms.py b/base/forms.py
index de1994993..4d13f6adb 100644
--- a/base/forms.py
+++ b/base/forms.py
@@ -118,6 +118,6 @@ class LoginForm(AuthenticationForm):
                                 attrs={
                                  'class': 'form-control', 'name': 'username'}))
     password = forms.CharField(label="Password", max_length=30,
-                               widget=forms.TextInput(
+                               widget=forms.PasswordInput(
                                 attrs={
                                  'class': 'form-control', 'name': 'password'}))
diff --git a/templates/base.html b/templates/base.html
index 91233c5da..afcf8f209 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -103,7 +103,7 @@
                 </li>
 
             </ul>
-            <ul class="nav navbar-nav navbar-right">
+            <ul class="nav navbar-nav navbar-right" id="autenticacao">
             {% if not user.is_authenticated %}
               <li><a href="{% url 'base:login' %}?next={{ current_path }}">Login</a></li>
             {% else %}
diff --git a/templates/base/login.html b/templates/base/login.html
index e091ef5a3..5ff0c8044 100644
--- a/templates/base/login.html
+++ b/templates/base/login.html
@@ -26,7 +26,7 @@
                           <p class="bs-component">
                               <table>
                                 {% if form.errors %}
-                                  <div class="alert alert-danger">Usuário e/ou Senha inexistente.
+                                  <div class="alert alert-danger">Usuário e/ou Senha inválidos.
                                   </div>
 
                                 {% endif %}
@@ -60,7 +60,7 @@
 
   <script>
   {% if not user.is_authenticated %}
-  $("ul.nav.navbar-nav.navbar-right").css("display","none");
+   $("#autenticacao") .css("display","none");
   {% endif %}
   </script>