diff --git a/debian/changelog b/debian/changelog
index 67060975..a2d5e985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (1.405.16) stable; urgency=low
+hedera-web (1.405.17) stable; urgency=low
 
   * Initial Release.
 
diff --git a/forms/admin/users/locale/ca.json b/forms/admin/users/locale/ca.json
index e43e4bfe..308cf05e 100755
--- a/forms/admin/users/locale/ca.json
+++ b/forms/admin/users/locale/ca.json
@@ -1,12 +1,7 @@
 {
-	 "UserManagement": "Gestió d'usuaris"
+	 "User management": "Gestió d'usuaris"
 
-	,"UserName:": "Nom d'usuari:"
-
-	,"UserNumber": "N usuari"
-	,"UserName": "Nom d'usuari"
-	,"Alias": "Alias"
-	
-	,"AccessAsUser": "Suplantar usuari"
-	,"AccessLog": "Registre d'accessos"
+	,"Disabled": "Deshabilitat"
+	,"Impersonate user": "Suplantar usuari"
+	,"Access log": "Registre d'accessos"
 }
diff --git a/forms/admin/users/locale/en.json b/forms/admin/users/locale/en.json
index 58aa9663..541b4619 100755
--- a/forms/admin/users/locale/en.json
+++ b/forms/admin/users/locale/en.json
@@ -1,12 +1,7 @@
 {
-	 "UserManagement": "User management"
-
-	,"UserName:": "Username:"
-
-	,"UserNumber": "User number"
-	,"UserName": "Username"
-	,"Alias": "Alias"
+	"User management": "User management"
 	
-	,"AccessAsUser": "Impersonate user"
-	,"AccessLog": "Access log"
+	,"Disabled": "Disabled"
+	,"Impersonate user": "Impersonate user"
+	,"Access log": "Access log"
 }
diff --git a/forms/admin/users/locale/es.json b/forms/admin/users/locale/es.json
index b7d55eda..646128f5 100755
--- a/forms/admin/users/locale/es.json
+++ b/forms/admin/users/locale/es.json
@@ -1,12 +1,7 @@
 {
-	 "UserManagement": "Gestión de usuarios"
-
-	,"UserName:": "Nombre de usuario:"
-
-	,"UserNumber": "Nº usuario"
-	,"UserName": "Nombre de usuario"
-	,"Alias": "Alias"
+	"User management": "Gestión de usuarios"
 	
-	,"AccessAsUser": "Suplantar usuario"
-	,"AccessLog": "Registro de accesos"
+	,"Disabled": "Desactivado"
+	,"Impersonate user": "Suplantar usuario"
+	,"Access log": "Registro de accesos"
 }
diff --git a/forms/admin/users/locale/fr.json b/forms/admin/users/locale/fr.json
index 60f93d58..70ebff1b 100755
--- a/forms/admin/users/locale/fr.json
+++ b/forms/admin/users/locale/fr.json
@@ -1,12 +1,7 @@
 {
-	 "UserManagement": "Gestion des utilisateurs"
-
-	,"UserName:": "Nom d'utilisateur:"
-
-	,"UserNumber": "Numéro utilisateurs"
-	,"UserName": "Nom d'utilisateur"
-	,"Alias": "Alias"
-
-	,"AccessAsUser": "Accès utilisateur"
-	,"AccessLog": "Journal des accès"
+	"User management": "Gestion des utilisateurs"
+	
+	,"Disabled": "Désactivé"
+	,"Impersonate user": "Accès utilisateur"
+	,"Access log": "Journal des accès"
 }
diff --git a/forms/admin/users/locale/mn.json b/forms/admin/users/locale/mn.json
index 58aa9663..541b4619 100755
--- a/forms/admin/users/locale/mn.json
+++ b/forms/admin/users/locale/mn.json
@@ -1,12 +1,7 @@
 {
-	 "UserManagement": "User management"
-
-	,"UserName:": "Username:"
-
-	,"UserNumber": "User number"
-	,"UserName": "Username"
-	,"Alias": "Alias"
+	"User management": "User management"
 	
-	,"AccessAsUser": "Impersonate user"
-	,"AccessLog": "Access log"
+	,"Disabled": "Disabled"
+	,"Impersonate user": "Impersonate user"
+	,"Access log": "Access log"
 }
diff --git a/forms/admin/users/locale/pt.json b/forms/admin/users/locale/pt.json
index d716ced1..b029f115 100644
--- a/forms/admin/users/locale/pt.json
+++ b/forms/admin/users/locale/pt.json
@@ -1,12 +1,7 @@
 {
-	 "UserManagement": "Gestão de usuarios"
-
-	,"UserName:": "Nome de usuario:"
-
-	,"UserNumber": "Nº usuario"
-	,"UserName": "Nome de usuario"
-	,"Alias": "Alias"
+	"User management": "Gestão de usuarios"
 	
-	,"AccessAsUser": "Suplantar usuario"
-	,"AccessLog": "Registro de acessos"
+	,"Disabled": "Desativado"
+	,"Impersonate user": "Suplantar usuario"
+	,"Access log": "Registro de acessos"
 }
diff --git a/forms/admin/users/style.css b/forms/admin/users/style.css
index 5dc8d8c8..30caf897 100644
--- a/forms/admin/users/style.css
+++ b/forms/admin/users/style.css
@@ -25,6 +25,16 @@
 {
 	font-size: 1.2em;
 }
+.users-box > .disabled
+{
+	float: right;
+	color: white;
+	background-color: #F66;
+	border-radius: .2em;
+	padding: .2em;
+	margin: .3em;
+	font-size: .8em;
+}
 
 /* Topbar */
 
diff --git a/forms/admin/users/ui.xml b/forms/admin/users/ui.xml
index 0183dfaf..088cac9d 100755
--- a/forms/admin/users/ui.xml
+++ b/forms/admin/users/ui.xml
@@ -4,7 +4,7 @@
 	<vn-hash-param key="user" param="user-name"/>
 </vn-group>
 <div id="title">
-	<h1><t>UserManagement</t></h1>
+	<h1><t>User management</t></h1>
 </div>
 <div id="actions">
 	<htk-search-entry
@@ -12,7 +12,7 @@
 </div>
 <div id="form" class="users">
 	<div class="box">
-		<htk-repeater form-id="iter">
+		<htk-repeater form-id="iter" renderer="rendererFunc">
 			<db-model property="model">
 				<custom>
 					SELECT u.id, u.name, u.nickname, u.active
@@ -33,20 +33,24 @@
 					<htk-button
 						form="iter"
 						column="id"
-						tip="_AccessAsUser"
-						icon="incognito"
-						on-click="onChangeUserClick"/>
-					<htk-button
-						form="iter"
-						column="id"
-						tip="_AccessLog"
+						tip="_Access log"
 						icon="gnome"
 						on-click="onAccessLogClick"/>
+					<htk-button
+						id="impersonate"
+						form="iter"
+						column="id"
+						tip="_Impersonate user"
+						icon="incognito"
+						on-click="onChangeUserClick"/>
+					<span id="disabled" class="disabled">
+						<t>Disabled</t>
+					</span>
 					<p class="important">
 						<htk-text form="iter" column="nickname"/>
 					</p>
 					<p>
-						<htk-text form="iter" column="id"/> - 
+						@<htk-text form="iter" column="id"/> - 
 						<htk-text form="iter" column="name"/>
 					</p>
 					<div class="clear"/>
diff --git a/forms/admin/users/users.js b/forms/admin/users/users.js
index 93b40407..28076b39 100644
--- a/forms/admin/users/users.js
+++ b/forms/admin/users/users.js
@@ -11,15 +11,19 @@ Hedera.Users = new Class
 		});
 	}
 
+	,rendererFunc: function (scope, form)
+	{
+		var isEnabled = form.get('active')
+		scope.$('disabled').style.display = isEnabled ?
+			'none' : 'block';
+		scope.$('impersonate').node.style.display = isEnabled ?
+			'block' : 'none';
+	}
+
 	,onChangeUserClick: function (button, form)
 	{
-		console.log (form.get ('active'));
-
-		if (form.get ('active'))
-			this.gui.supplantUser (form.get ('name'),
-				this.onUserSupplant.bind (this));
-		else
-			Htk.Toast.showError (_('The user account is disabled'));
+		this.gui.supplantUser (form.get ('name'),
+			this.onUserSupplant.bind (this));
 	}
 	
 	,onUserSupplant: function (userName)