--- smeserver-remoteuseraccess-1.2/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/remoteuseraccess.pm.add2general	2006-11-23 10:11:14.000000000 +0100
+++ smeserver-remoteuseraccess-1.2/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/remoteuseraccess.pm	2008-04-26 22:38:14.000000000 +0200
@@ -49,7 +49,7 @@
 
     my $user_table =
     {
-       title => $self->localise('CURRENT_LIST_OF_USERS'),
+       title => $self->localise('USER_LIST_CURRENT'),
 
        stripe => '#D4D0C8',
 
@@ -59,10 +59,10 @@
 
        field_attr => {
                        User          => {
-                                           label => $self->localise('LABEL_USER')
+                                           label => $self->localise('ACCOUNT')
                                         },
                        FullName      => {
-                                           label => $self->localise('LABEL_FULLNAME')
+                                           label => $self->localise('USER_NAME')
                                         },
                        shell         => {
                                            label => $self->localise('SHELL_ACCESS')
@@ -89,7 +89,7 @@
     my @data = ();
     my @users = $adb->users;
 
-    return $self->localise("NO_ACCOUNTS") if (@users == 0);
+    return $self->localise("ACCOUNT_USER_NONE") if (@users == 0);
 
     for my $user (@users)
     {
--- smeserver-remoteuseraccess-1.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteuseraccess.add2general	2008-04-26 22:33:59.000000000 +0200
+++ smeserver-remoteuseraccess-1.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteuseraccess	2008-04-26 22:43:25.000000000 +0200
@@ -12,18 +12,6 @@
       <trans>Change user remote access settings</trans>
     </entry>
     <entry>
-      <base>CURRENT_LIST_OF_USERS</base>
-      <trans>Current list of users</trans>
-    </entry>
-    <entry>
-      <base>LABEL_USER</base>
-      <trans>Account</trans>
-    </entry>
-    <entry>
-      <base>LABEL_FULLNAME</base>
-      <trans>User Name</trans>
-    </entry>
-    <entry>
       <base>SHELL_ACCESS</base>
       <trans>Shell</trans>
     </entry>
@@ -64,14 +52,6 @@
       <trans>Sudo Access</trans>
     </entry>
     <entry>
-      <base>NO_ACCOUNTS</base>
-      <trans>There are no user accounts in the system.</trans>
-    </entry>
-    <entry>
-      <base>SUCCESS</base>
-      <trans>Success</trans>
-    </entry>
-    <entry>
       <base>MODIFY_DESCRIPTION</base>
 	  <trans>  <![CDATA[
 	      <p>
@@ -108,8 +88,4 @@
              but they will wrap onto three or more lines in the display.
              To delete all keys type "deletekeys". </trans>
     </entry>
-    <entry>
-      <base>INVALID_USER</base>
-      <trans>Invalid user</trans>
-    </entry>
 </lexicon>
--- smeserver-remoteuseraccess-1.2/root/etc/e-smith/web/functions/remoteuseraccess.add2general	2006-11-10 05:35:44.000000000 +0100
+++ smeserver-remoteuseraccess-1.2/root/etc/e-smith/web/functions/remoteuseraccess	2008-04-26 22:39:18.000000000 +0200
@@ -42,11 +42,11 @@
         <description>MODIFY_DESCRIPTION</description>
 
         <field type="literal" id="User" >
-            <label>LABEL_USER</label>
+            <label>ACCOUNT</label>
         </field>
 
         <field type="literal" id="FullName">
-            <label>LABEL_FULLNAME</label>
+            <label>USER_NAME</label>
         </field>
 
         <field
--- smeserver-remoteuseraccess-1.2/root/etc/e-smith/web/functions/userpanel-sshkeys.add2general	2006-11-10 05:35:50.000000000 +0100
+++ smeserver-remoteuseraccess-1.2/root/etc/e-smith/web/functions/userpanel-sshkeys	2008-04-26 22:39:58.000000000 +0200
@@ -40,11 +40,11 @@
         <description>SSHKEYS_DESCRIPTION</description>
 
         <field type="literal" id="User" value="get_panel_user()">
-            <label>LABEL_USER</label>
+            <label>ACCOUNT</label>
         </field>
 
         <field type="literal" id="FullName" value="get_full_name()">
-            <label>LABEL_FULLNAME</label>
+            <label>USER_NAME</label>
         </field>
 
         <field type="textarea"