diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index b54425c6c..dab5d4415 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -256,6 +256,10 @@ password.reset=Reset Password
 password.reset.success=Password reset.
 rememberme=Remember Me
 user.login.welcome=Welcome {0}
+users.grid.unlock=Unlock
+users.grid.lock=Lock
+users.grid.unforceChangePassword=Not force password change
+users.grid.forceChangePassword=Force password change
 
 #roles management
 roles.management.header=Roles Management
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html
index 9102ce2f0..3db9d88ce 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html
@@ -218,11 +218,15 @@
 
     {{if row.locked()==true}}
     <td>
-      <a href="#" data-bind="click: function(){ unlock(row) }"><img src="images/system-lock-screen-22-22.png"/></a>
+      <a href="#" data-bind="click: function(){ unlock(row) }">
+        <img src="images/system-lock-screen-22-22.png" title="${$.i18n.prop('users.grid.unlock')}"/>
+      </a>
     </td>
     {{else}}
     <td>
-      <a href="#" data-bind="click: function(){ lock(row) }"><img src="images/weather-clear-22-22.png"/></a>
+      <a href="#" data-bind="click: function(){ lock(row) }">
+        <img src="images/weather-clear-22-22.png" title="${$.i18n.prop('users.grid.lock')}"/>
+      </a>
     </td>
     {{/if}}
 
@@ -232,13 +236,13 @@
     {{if row.passwordChangeRequired()==true}}
     <td>
       <a href="#" data-bind="click: function(){ passwordChangeRequire(row,false) }">
-        <img src="images/dialog-error-22-22.png"/>
+        <img src="images/dialog-error-22-22.png" title="${$.i18n.prop('users.grid.unforceChangePassword')}"/>
       </a>
     </td>
     {{else}}
     <td>
       <a href="#" data-bind="click: function(){ passwordChangeRequire(row,true) }">
-        <img src="images/weather-clear-22-22.png"/>
+        <img src="images/weather-clear-22-22.png" title="${$.i18n.prop('users.grid.forceChangePassword')}"/>
       </a>
     </td>
     {{/if}}