diff --git a/sapl/base/forms.py b/sapl/base/forms.py
index fb7125341..23c919ae0 100644
--- a/sapl/base/forms.py
+++ b/sapl/base/forms.py
@@ -7,10 +7,9 @@ from django.contrib.auth import get_user_model
 from django.contrib.auth.forms import (AuthenticationForm, PasswordResetForm,
                                        SetPasswordForm)
 from django.contrib.auth.models import Group, User
-from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db import models, transaction
-from django.forms import ModelForm
+from django.forms import ModelForm, Form
 from django.utils.translation import string_concat
 from django.utils.translation import ugettext_lazy as _
 
@@ -714,19 +713,70 @@ class NovaSenhaForm(SetPasswordForm):
             row1,
             form_actions(label='Enviar'))
 
-class AlterarSenhaForm(forms.Form):
-    new_password1 = forms.PasswordInput()
-    new_password2 = forms.PasswordInput()
-
-    # def __init__(self, *args, **kwargs):
-    #
-    #     super(AlterarSenhaForm, self).__init__(*args, **kwargs)
-    #
-    #     row1 = to_row(
-    #         [('new_password1', 6),
-    #          ('new_password2', 6)])
-    #
-    #     self.helper = FormHelper()
-    #     self.helper.layout = Layout(
-    #         row1,
-    #         form_actions(label='Alterar'))
\ No newline at end of file
+
+class AlterarSenhaForm(Form):
+
+    username = forms.CharField(widget=forms.HiddenInput())
+
+    old_password = forms.CharField(label='Senha atual',
+                                   max_length=50,
+                                   widget=forms.PasswordInput())
+    new_password1 = forms.CharField(label='Nova senha',
+                                    max_length=50,
+                                    widget=forms.PasswordInput())
+    new_password2 = forms.CharField(label='Confirmar senha',
+                                    max_length=50,
+                                    widget=forms.PasswordInput())
+
+
+    class Meta:
+        fields = ['username', 'old_password', 'new_password1', 'new_password2']
+
+    def __init__(self, *args, **kwargs):
+
+        super(AlterarSenhaForm, self).__init__(*args, **kwargs)
+
+        row1 = to_row([('old_password', 12)])
+        row2 = to_row(
+            [('new_password1', 6),
+             ('new_password2', 6)])
+
+        self.helper = FormHelper()
+        self.helper.layout = Layout(
+            row1,
+            row2,
+            form_actions(label='Alterar Senha'))
+
+    def clean(self):
+        super(AlterarSenhaForm, self).clean()
+
+        data = self.cleaned_data
+
+        new_password1 = data['new_password1']
+        new_password2 = data['new_password2']
+
+        if new_password1 != new_password2:
+            raise ValidationError("'Nova Senha' diferente de 'Confirmar Senha'")
+
+        # TODO: colocar mais regras como: tamanho mínimo,
+        # TODO: caracteres alfanuméricos, maiúsculas (?),
+        # TODO: senha atual igual a senha anterior, etc
+
+        if len(new_password1) < 6:
+            raise ValidationError("A senha informada deve ter no mínimo 6 caracteres")
+
+        username = data['username']
+        old_password = data['old_password']
+        user = User.objects.get(username=username)
+
+        if user.is_anonymous():
+            raise ValidationError("Não é possível alterar senha de usuário anônimo")
+
+        if not user.check_password(old_password):
+            raise ValidationError("Senha atual informada não confere "
+                                  "com a senha armazenada")
+
+        if user.check_password(new_password1):
+            raise ValidationError("Nova senha não pode ser igual à senha anterior")
+
+        return self.cleaned_data
\ No newline at end of file
diff --git a/sapl/base/urls.py b/sapl/base/urls.py
index 03a953bed..88c423f52 100644
--- a/sapl/base/urls.py
+++ b/sapl/base/urls.py
@@ -21,7 +21,7 @@ from .views import (AppConfigCrud, CasaLegislativaCrud, HelpTopicView,
 app_name = AppConfig.name
 
 alterar_senha = [
-    url(r'^alterar-senha/$',
+    url(r'^sistema/alterar-senha/$',
         AlterarSenha.as_view(),
         name='alterar_senha'),
 
diff --git a/sapl/base/views.py b/sapl/base/views.py
index a557bc947..700b0a30a 100644
--- a/sapl/base/views.py
+++ b/sapl/base/views.py
@@ -605,9 +605,24 @@ class SaplSearchView(SearchView):
 
         return context
 
+
 class AlterarSenha(FormView):
+    from sapl.settings import LOGIN_URL
+
     form_class = AlterarSenhaForm
-    template_name = 'base/alterar_senha_form.html'
-    def post(self, request, *args, **kwargs):
-        self.get_form()
-        return self.get(request, *args, **kwargs)
\ No newline at end of file
+    template_name = 'base/alterar_senha.html'
+    success_url = LOGIN_URL
+
+    def get_initial(self):
+        initial = super(AlterarSenha, self).get_initial()
+        initial['username'] = self.request.user
+        return initial
+
+    def form_valid(self, form):
+        new_password = form.cleaned_data['new_password1']
+
+        user = self.request.user
+        user.set_password(new_password)
+        user.save()
+
+        return super().form_valid(form)
\ No newline at end of file
diff --git a/sapl/templates/base.html b/sapl/templates/base.html
index efcd0a647..8f4a45038 100644
--- a/sapl/templates/base.html
+++ b/sapl/templates/base.html
@@ -69,6 +69,7 @@
                         Votar Matéria
                       </a></li>
                     {% endif %}
+                    <li><a href="{% url 'sapl.base:alterar_senha' %}">Alterar senha</a></li>
                     <li><a href="{% url 'sapl.base:logout' %}">Sair</a></li>
                   </ul>
                 </li>
diff --git a/sapl/templates/base/alterar_senha.html b/sapl/templates/base/alterar_senha.html
new file mode 100644
index 000000000..20956a763
--- /dev/null
+++ b/sapl/templates/base/alterar_senha.html
@@ -0,0 +1,12 @@
+{% extends "crud/detail.html" %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+{% block actions %}{% endblock %}
+{% block detail_content %}
+    <h1>Alterar Senha</h1>
+	{% crispy form %}
+    </br>
+    Atenção, a mudança de senha fará com que o usuário atual seja deslogado do sistema.</br>
+    Favor entrar novamente com a nova senha após a mudança com sucesso.
+
+{% endblock detail_content %}
\ No newline at end of file
diff --git a/sapl/templates/base/alterar_senha_form.html b/sapl/templates/base/alterar_senha_form.html
deleted file mode 100644
index ab9f19520..000000000
--- a/sapl/templates/base/alterar_senha_form.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "crud/form.html" %}
\ No newline at end of file