diff --git a/index.html b/index.html
index 4f67999..4fdfbc4 100644
--- a/index.html
+++ b/index.html
@@ -422,6 +422,32 @@
         </div>
       </form>
 
+      <form id="new-password-form" class="new-password hide" autocomplete="off" method="post">
+        <p class="box-subtitle">Trocar senha</p>
+        <div class="message alert-danger hide"></div>
+        <div class="row">
+          <div class="value col-sm-12">
+            <label for="new-password" class="label">Informe a nova senha:</label>
+            <input id="new-password" name="password" type="password" required placeholder="Nova senha">
+          </div>
+        </div>
+        <div class="row">
+          <div class="value col-sm-12">
+            <label for="new-password-confirmation" class="label">Confirme a nova senha:</label>
+            <input id="new-password-confirmation" name="password_confirmation" type="password" required placeholder="Confirmação da senha">
+          </div>
+          <input type="hidden" id="new-password-code" name="code">
+        </div>
+        <div class="row">
+          <div class="col-sm-4">
+            <button type="submit" class="confirm-new-password button button-confirm button-block">Confirmar</button>
+          </div>
+          <div class="col-sm-4">
+            <button type="button" class="cancel-new-password button button-cancela button-block">Cancelar</button>
+          </div>
+        </div>
+      </form>
+
       <form id="forgot-password-form" class="forgot-password hide" autocomplete="off" method="post">
         <p class="box-subtitle">Esqueceu sua senha?</p>
         <div class="message alert-danger hide"></div>
diff --git a/js/main.js b/js/main.js
index 456cc49..6017699 100644
--- a/js/main.js
+++ b/js/main.js
@@ -594,6 +594,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
         var regexResultados = /resultados$/;
         var regexSobreOPrograma = /sobre-o-programa$/;
         var regexActivateUser = /#\/activate/;
+        var regexChangeUserPassword = /#\/trocar_senha/;
 
         if( (regexHideBarra.exec(hash) === null) && !HIDE_BARRA_DO_GOVERNO ){
           this.addBarraDoGoverno();
@@ -612,6 +613,7 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
         var isResultados      = regexResultados.exec(hash) !== null;
         var isSobreOPrograma  = regexSobreOPrograma.exec(hash) !== null;
         var isActivateUser    = regexActivateUser.exec(hash) !== null;
+        var isChangeUserPassword = regexChangeUserPassword.exec(hash) !== null;
 
         if(isArticle) {
           this.display_article(hash.split('/')[2], lastHash);
@@ -688,6 +690,11 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
           Main.activateUser(code);
         }
 
+        if(isChangeUserPassword){
+          var code = parts.pop();
+          Main.changeUserPassword(code);
+        }
+
         // [BEGIN] Tracking
         if (window._paq){
           // _paq.push(['trackEvent', 'NavegarPara', hash || '/']);
@@ -944,6 +951,15 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
       handleLoginFail: function (e){
         console.error('handleLoginFail', e);
       },
+      changeUserPassword: function(code){
+        if(!code || code.length == 0) return;
+        var $loginPanel = $('#login-panel');
+        $loginPanel.show();
+        $loginPanel.find('#login-form').hide();
+        var $newPasswordForm = $loginPanel.find('#new-password-form');
+        $newPasswordForm.find('#new-password-code').val(code);
+        $newPasswordForm.show();
+      },
       activateUser: function(code){
 
         /**
@@ -1052,8 +1068,6 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
       $('.login-container').html(loginTemplate());
       $('.countdown').maxlength({text: '%left caracteres restantes'});
 
-      Main.navigateTo(window.location.hash);
-
       $(document).on('click', '.oauth-login', function (e){
         Main.oauthClientAction($(this).attr('href'));
         e.preventDefault();
@@ -1112,6 +1126,8 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
         $('.participar').removeClass('hide');
       })();
 
+      Main.navigateTo(window.location.hash);
+
       //Actions for links
       $( '#nav-proposal-categories a' ).on('click', function(e){
         e.preventDefault();
@@ -1374,6 +1390,38 @@ define(['jquery', 'handlebars', 'fastclick', 'proposal_app', 'handlebars_helpers
       e.preventDefault();
     });
 
+    $(document).on('click', '.cancel-new-password', function(e) {
+      var newPasswordForm = $(this).parents('#new-password-form');
+      var loginForm = newPasswordForm.siblings('#login-form');
+      loginForm.show();
+      newPasswordForm.hide();
+    });
+
+    $(document).on('click', '.confirm-new-password', function(e) {
+      var $newPasswordForm = $(this).parents('#new-password-form');
+      $.ajax({
+        method: 'PATCH',
+        url:host+'/api/v1/new_password',
+        data: {
+          code: $newPasswordForm.find('#new-password-code').val(),
+          password: $newPasswordForm.find('#new-password').val(),
+          password_confirmation: $newPasswordForm.find('#new-password-confirmation').val()
+        },
+      }).done(function(data) {
+        $newPasswordForm.find('.cancel-new-password').click();
+        var $message = $newPasswordForm.siblings('#login-form').find('.message-success');
+        $message.html('Senha alterada com sucesso.');
+        $message.show();
+        Main.loginCallback(data.activated, data.private_token, data);
+        window.location.hash = '/';
+      }).fail(function() {
+        var $message = $newPasswordForm.find('.message');
+        $message.html('Não foi possível trocar a senha com os dados informados.');
+        $message.show();
+      });
+      e.preventDefault();
+    });
+
     $(document).on('click', '.confirm-forgot-password', function(e) {
       var $forgotPasswordForm = $(this).parents('#forgot-password-form');
       var $inputValue = $forgotPasswordForm.find('#forgot-password-value');
--
libgit2 0.21.2