=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm	2013-12-04 14:39:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm	2014-01-20 02:52:16 +0000
@@ -36,8 +36,8 @@
 				    data-can-manage="$security.canManage( $userAuthorityGroup )"
 				    data-can-update="$security.canUpdate( $userAuthorityGroup )"
 				    data-can-delete="$security.canDelete( $userAuthorityGroup )">
-				    <td>$encoder.htmlEncode( $!userAuthorityGroup.displayName )</td>
-				    <td>$encoder.htmlEncode( $!userAuthorityGroup.description )</td>
+				    <td>$!encoder.htmlEncode( $userAuthorityGroup.displayName )</td>
+				    <td>$!encoder.htmlEncode( $userAuthorityGroup.description )</td>
 				</tr>
 				#end
 				</tbody>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm	2013-12-04 14:39:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm	2014-01-20 02:52:16 +0000
@@ -60,13 +60,13 @@
 				<tbody id="list">
 				#foreach( $userCredentials in $userCredentialsList )
 				<tr id="tr${userCredentials.id}" data-id="$!userCredentials.id" data-uid="$!userCredentials.uid" data-type="UserCredentials"
-            data-name="$encoder.htmlEncode( $!userCredentials.displayName )"
-            data-username="$encoder.htmlEncode( $!userCredentials.username )"
+                    data-name="$encoder.htmlEncode( $!userCredentials.displayName )"
+                    data-username="$encoder.htmlEncode( $!userCredentials.username )"
 				    data-can-manage="$security.canManage( $userCredentials )"
 				    data-can-update="$security.canUpdate( $userCredentials )"
 				    data-can-delete="$security.canDelete( $userCredentials )"
-            data-user-enabled="#if( !$userCredentials.disabled )true#{else}false#end"
-            data-user-disabled="$userCredentials.disabled">
+                    data-user-enabled="#if( !$userCredentials.disabled )true#{else}false#end"
+                    data-user-disabled="$userCredentials.disabled">
 				    <td>$encoder.htmlEncode( $!userCredentials.username )</td>
 				    <td>$encoder.htmlEncode( $!userCredentials.displayName )</td>
         </tr>