diff --git a/ghost/admin/app/routes/team/user.js b/ghost/admin/app/routes/team/user.js
index 30613ece1e..3d14cadb9c 100644
--- a/ghost/admin/app/routes/team/user.js
+++ b/ghost/admin/app/routes/team/user.js
@@ -33,6 +33,11 @@ export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
     },
 
     actions: {
+        willTransition() {
+            this.controller.set('user.password', '');
+            this.controller.set('user.newPassword', '');
+            this.controller.set('user.ne2Password', '');
+        },
         didTransition() {
             this.modelFor('team.user').get('errors').clear();
         },