4 files changed, 8 insertions, 5 deletions
diff --git a/rt/html/User/Delegation.html b/rt/html/User/Delegation.html
index c036f78ec..9c60f6acf 100644
--- a/rt/html/User/Delegation.html
+++ b/rt/html/User/Delegation.html
@@ -33,7 +33,7 @@
 <& Elements/DelegateRights, personalgroups => $personalgroups, objects => $objects, ObjectType => 'RT::Queue' &>
 <& Elements/DelegateRights, personalgroups => $personalgroups, objects => $objects, ObjectType => 'RT::Group' &>
 
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Modify Rights') &>
 </form>
 <%INIT>
 
diff --git a/rt/html/User/Groups/Members.html b/rt/html/User/Groups/Members.html
index db83b8c0f..1c031366b 100644
--- a/rt/html/User/Groups/Members.html
+++ b/rt/html/User/Groups/Members.html
@@ -76,7 +76,7 @@
 </TD>
 </TR>
 </TABLE>
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Modify Members') &>
 </form>
 
 
diff --git a/rt/html/User/Groups/Modify.html b/rt/html/User/Groups/Modify.html
index f731e1a82..8190afa92 100644
--- a/rt/html/User/Groups/Modify.html
+++ b/rt/html/User/Groups/Modify.html
@@ -52,7 +52,7 @@
 <INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>> <&|/l&>Enabled (Unchecking this box disables this group)</&><BR>
 </TR>
 </TABLE>
-<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
+<& /Elements/Submit, Label => loc('Create'), Reset => 1 &>
 </form>
 <%INIT>
 
diff --git a/rt/html/User/Prefs.html b/rt/html/User/Prefs.html
index c2746a38c..68f12b81e 100644
--- a/rt/html/User/Prefs.html
+++ b/rt/html/User/Prefs.html
@@ -157,7 +157,7 @@
 </TABLE>
 
 
-<& /Elements/Submit &>
+<& /Elements/Submit, Label => loc('Save Preferences') &>
 </form>
 
 
@@ -190,7 +190,10 @@ if ($UserObj->Id) {
     my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
 					    Object => $UserObj,
 					    ARGSRef => \%ARGS );
-    $session{'CurrentUser'}->LanguageHandle($Lang) if $Lang;
+    if ($Lang) {
+        $session{'CurrentUser'}->LanguageHandle($Lang);
+        $session{'CurrentUser'}= $session{'CurrentUser'}; # Force writeback
+    }
     push (@results,@fieldresults);