update address standardization for cust_location changes

1 files changed, 6 insertions, 5 deletions

diff --git a/rt/share/html/Install/Finish.html b/rt/share/html/Install/Finish.html
index 3ebd407ea..24ac0ff71 100644
--- a/rt/share/html/Install/Finish.html
+++ b/rt/share/html/Install/Finish.html
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -53,11 +53,11 @@
 </p>
 
 <p>
-<&|/l&>You should be taken directly to a login page. You'll be able to log in with username of <tt>root</tt> and the password you set earlier.</&>
+<&|/l_unsafe, '<tt>root</tt>' &>You should be taken directly to a login page. You'll be able to log in with username of [_1] and the password you set earlier.</&>
 </p>
 
 <p>
-<&|/l&>If you've change the Port that RT runs on, you'll need to restart the server in order to log in.</&>
+<&|/l&>If you've changed the Port that RT runs on, you'll need to restart the server in order to log in.</&>
 </p>
 
 <p>
@@ -82,9 +82,10 @@ if ( $Run ) {
     system( 'chmod -w ' . RT::Installer->ConfigFile ) &&
         $RT::Logger->error(
                 'failed to make ' . RT::Installer->ConfigFile . ' readonly' );
-    my $root = RT::User->new( $RT::SystemUser );
+    my $root = RT::User->new( RT->SystemUser );
     $root->Load('root');
-    $root->SetPassword( $RT::Installer->{InstallConfig}{Password} );
+    my ($ok, $val) = $root->SetPassword( $RT::Installer->{InstallConfig}{Password} );
+    $RT::Logger->warning("Unable to set root password: $val") if !$ok;
 
     RT::Interface::Web::Redirect(RT->Config->Get('WebURL'));
 }