X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fotaker_Mixin.pm;h=4aa47c38d82d85384a94c518524851f92f5e1eb4;hp=c8479cd7790b7c97b8f0832224e8024adf13bc11;hb=dcfabb6fcf75a5a43e0d00eb4e25db61ea155f89;hpb=55375c203e5d337e232041e368869a6336f1fd26

diff --git a/FS/FS/otaker_Mixin.pm b/FS/FS/otaker_Mixin.pm
index c8479cd77..4aa47c38d 100644
--- a/FS/FS/otaker_Mixin.pm
+++ b/FS/FS/otaker_Mixin.pm
@@ -52,14 +52,16 @@ sub _upgrade_otaker {
       eval { $record->otaker($record->otaker) };
       if ( $@ ) {
         my $username = $record->otaker;
+        my($lastname, $firstname) = ( 'User', 'Legacy' );
         if ( $username =~ /^(.+), (.+)$/ ) {
-          $username = lc($2.$1);
+          ($lastname, $firstname) = ($1, $2);
+          $username = lc($firstname.$lastname);
         }
         my $access_user = new FS::access_user {
           'username'  => $username,
           '_password' => 'CHANGEME',
-          'first'     => 'Legacy',
-          'last'      => 'User',
+          'first'     => $firstname,
+          'last'      => $lastname,
           'disabled'  => 'Y',
         };
         my $error = $access_user->insert;