diff --git a/bower.json b/bower.json
index f4cb3d9..ea2bcc8 100644
--- a/bower.json
+++ b/bower.json
@@ -39,7 +39,8 @@
     "angular-click-outside": "^2.7.1",
     "ng-ckeditor": "^0.2.1",
     "angular-tag-cloud": "^0.3.0",
-    "angular-ui-switch": "^0.1.1"
+    "angular-ui-switch": "^0.1.1",
+    "angular-password": "^1.0.1"
   },
   "devDependencies": {
     "angular-mocks": "~1.5.0"
diff --git a/src/app/account/register-component.html b/src/app/account/register-component.html
index a6ae020..bc2609c 100644
--- a/src/app/account/register-component.html
+++ b/src/app/account/register-component.html
@@ -51,11 +51,12 @@
       <div class="form-group col-md-6 register-field" ng-class="ctrl.isInvalid(signupForm.passwordConfirm)">
         <div class="input-group">
           <span class="input-group-addon"><i class="fa fa-unlock-alt"></i></span>
-          <input type="password" class="form-control" id="passwordConfirm" name="passwordConfirm" placeholder="{{'account.register.passwordConfirmationLabel' | translate}}" ng-model="ctrl.account.password_confirmation" required>
+          <input type="password" class="form-control" id="passwordConfirm" name="passwordConfirm" match-password="password" placeholder="{{'account.register.passwordConfirmationLabel' | translate}}" ng-model="ctrl.account.password_confirmation" required>
         </div>
         <div class="help-block" ng-show="signupForm.passwordConfirm.$touched" ng-messages="signupForm.passwordConfirm.$error">
           <ul class="list-unstyled">
             <li ng-messages-include="languages/messages.html"></li>
+            <li ng-message="passwordMatch" translate="messages.invalid.passwordMatch"></li>
           </ul>
         </div>
       </div>
diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts
index 773e460..5c1a11e 100644
--- a/src/app/main/main.component.ts
+++ b/src/app/main/main.component.ts
@@ -1,53 +1,53 @@
 import * as plugins from "../../plugins";
-import {bundle, Component, StateConfig, Inject} from "ng-forward";
-import {ArticleBlogComponent} from "./../article/types/blog/blog.component";
-
-import {ArticleViewComponent} from "./../article/article-default-view.component";
-
-import {ProfileComponent} from "../profile/profile.component";
-import {BoxesComponent} from "../layout/boxes/boxes.component";
-import {BlockContentComponent} from "../layout/blocks/block-content.component";
-import {BlockComponent} from "../layout/blocks/block.component";
-import {EnvironmentComponent} from "../environment/environment.component";
-import {EnvironmentHomeComponent} from "../environment/environment-home.component";
-import {PeopleBlockComponent} from "../layout/blocks/people/people-block.component";
-import {DisplayContentBlockComponent} from "../layout/blocks/display-content/display-content-block.component";
-import {LinkListBlockComponent} from "../layout/blocks/link-list/link-list-block.component";
-import {RecentDocumentsBlockComponent} from "../layout/blocks/recent-documents/recent-documents-block.component";
-import {ProfileImageBlockComponent} from "../layout/blocks/profile-image/profile-image-block.component";
-import {RawHTMLBlockComponent} from "../layout/blocks/raw-html/raw-html-block.component";
-import {StatisticsBlockComponent} from "../layout/blocks/statistics/statistics-block.component";
-import {PersonTagsPluginInterestsBlockComponent} from "../layout/blocks/person-tags-plugin-interests/person-tags-plugin-interests-block.component";
-import {TagsBlockComponent} from "../layout/blocks/tags/tags-block.component";
-import {CustomContentComponent} from "../profile/custom-content/custom-content.component";
-import {RecentActivitiesPluginActivitiesBlockComponent} from "../layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.component";
-import {RegisterComponent} from "../account/register.component";
-
-import {MembersBlockComponent} from "../layout/blocks/members/members-block.component";
-import {CommunitiesBlockComponent} from "../layout/blocks/communities/communities-block.component";
-
-import {LoginBlockComponent} from "../layout/blocks/login-block/login-block.component";
-
-import {NoosferoTemplate} from "../shared/pipes/noosfero-template.filter";
-import {DateFormat} from "../shared/pipes/date-format.filter";
-
-import {AuthService} from "../login/auth.service";
-import {SessionService} from "../login/session.service";
-import {EnvironmentService} from "./../../lib/ng-noosfero-api/http/environment.service";
-import {NotificationService} from "../shared/services/notification.service";
-import {RegisterService} from "./../../lib/ng-noosfero-api/http/register.service";
-
-import {BodyStateClassesService} from "./../layout/services/body-state-classes.service";
-
-import {Navbar} from "../layout/navbar/navbar";
-
-import {SidebarComponent} from "../layout/sidebar/sidebar.component";
-
-import {MainBlockComponent} from "../layout/blocks/main/main-block.component";
-import {HtmlEditorComponent} from "../shared/components/html-editor/html-editor.component";
-import {PermissionDirective} from "../shared/components/permission/permission.directive";
-import {SearchComponent} from "../search/search.component";
-import {SearchFormComponent} from "../search/search-form/search-form.component";
+import { bundle, Component, StateConfig, Inject } from "ng-forward";
+import { ArticleBlogComponent } from "./../article/types/blog/blog.component";
+
+import { ArticleViewComponent } from "./../article/article-default-view.component";
+
+import { ProfileComponent } from "../profile/profile.component";
+import { BoxesComponent } from "../layout/boxes/boxes.component";
+import { BlockContentComponent } from "../layout/blocks/block-content.component";
+import { BlockComponent } from "../layout/blocks/block.component";
+import { EnvironmentComponent } from "../environment/environment.component";
+import { EnvironmentHomeComponent } from "../environment/environment-home.component";
+import { PeopleBlockComponent } from "../layout/blocks/people/people-block.component";
+import { DisplayContentBlockComponent } from "../layout/blocks/display-content/display-content-block.component";
+import { LinkListBlockComponent } from "../layout/blocks/link-list/link-list-block.component";
+import { RecentDocumentsBlockComponent } from "../layout/blocks/recent-documents/recent-documents-block.component";
+import { ProfileImageBlockComponent } from "../layout/blocks/profile-image/profile-image-block.component";
+import { RawHTMLBlockComponent } from "../layout/blocks/raw-html/raw-html-block.component";
+import { StatisticsBlockComponent } from "../layout/blocks/statistics/statistics-block.component";
+import { PersonTagsPluginInterestsBlockComponent } from "../layout/blocks/person-tags-plugin-interests/person-tags-plugin-interests-block.component";
+import { TagsBlockComponent } from "../layout/blocks/tags/tags-block.component";
+import { CustomContentComponent } from "../profile/custom-content/custom-content.component";
+import { RecentActivitiesPluginActivitiesBlockComponent } from "../layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.component";
+import { RegisterComponent } from "../account/register.component";
+
+import { MembersBlockComponent } from "../layout/blocks/members/members-block.component";
+import { CommunitiesBlockComponent } from "../layout/blocks/communities/communities-block.component";
+
+import { LoginBlockComponent } from "../layout/blocks/login-block/login-block.component";
+
+import { NoosferoTemplate } from "../shared/pipes/noosfero-template.filter";
+import { DateFormat } from "../shared/pipes/date-format.filter";
+
+import { AuthService } from "../login/auth.service";
+import { SessionService } from "../login/session.service";
+import { EnvironmentService } from "./../../lib/ng-noosfero-api/http/environment.service";
+import { NotificationService } from "../shared/services/notification.service";
+import { RegisterService } from "./../../lib/ng-noosfero-api/http/register.service";
+
+import { BodyStateClassesService } from "./../layout/services/body-state-classes.service";
+
+import { Navbar } from "../layout/navbar/navbar";
+
+import { SidebarComponent } from "../layout/sidebar/sidebar.component";
+
+import { MainBlockComponent } from "../layout/blocks/main/main-block.component";
+import { HtmlEditorComponent } from "../shared/components/html-editor/html-editor.component";
+import { PermissionDirective } from "../shared/components/permission/permission.directive";
+import { SearchComponent } from "../search/search.component";
+import { SearchFormComponent } from "../search/search-form/search-form.component";
 
 import { EVENTS_HUB_KNOW_EVENT_NAMES, EventsHubService } from "../shared/services/events-hub.service";
 import { NoosferoKnownEvents } from "../known-events";
@@ -124,7 +124,7 @@ export class EnvironmentContent {
         "angular-bind-html-compile", "angularMoment", "angular.filter", "akoenig.deckgrid",
         "angular-timeline", "duScroll", "oitozero.ngSweetAlert",
         "pascalprecht.translate", "tmh.dynamicLocale", "angularLoad",
-        "angular-click-outside", "ngTagCloud", "noosfero.init", "uiSwitch"]
+        "angular-click-outside", "ngTagCloud", "noosfero.init", "uiSwitch", "ngPassword"]
 })
 @StateConfig([
     {
diff --git a/src/languages/en.json b/src/languages/en.json
index e16e922..de958ff 100644
--- a/src/languages/en.json
+++ b/src/languages/en.json
@@ -119,5 +119,5 @@
   "messages.invalid.maxlength": "This field is too long",
   "messages.invalid.minlength": "This field is too short",
   "messages.invalid.email": "This needs to be a valid email",
-  "messages.invalid.passwordConfirm": "Passwords do not match"
+  "messages.invalid.passwordMatch": "Your passwords did not match"
 }
diff --git a/src/languages/pt.json b/src/languages/pt.json
index 1c74f32..d9e07f2 100644
--- a/src/languages/pt.json
+++ b/src/languages/pt.json
@@ -122,5 +122,5 @@
   "messages.invalid.maxlength": "O valor é muito longo",
   "messages.invalid.minlength": "O valor é muito curto",
   "messages.invalid.email": "Informe um email válido",
-  "messages.invalid.passwordConfirm": "As senhas não coincidem"
+  "messages.invalid.passwordMatch": "As senhas não coincidem"
 }
--
libgit2 0.21.2