Merge branch 'master' of git.freeside.biz:/home/git/freeside

2 files changed, 3 insertions, 2 deletions

diff --git a/FS/FS/part_pkg_link.pm b/FS/FS/part_pkg_link.pm
index 8e43d155e..ce071ef17 100644
--- a/FS/FS/part_pkg_link.pm
+++ b/FS/FS/part_pkg_link.pm
@@ -130,6 +130,7 @@ sub insert {
     return $error if $error;
   }
 
+  $dbh->commit if $oldAutoCommit;
   return;
 }
 
@@ -166,7 +167,7 @@ sub delete {
     $dbh->rollback if $oldAutoCommit;
     return $error;
   }
-  $dbh->commit;
+  $dbh->commit if $oldAutoCommit;
   return;
 }
 
diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 2f4e22cbf..6b4becb5f 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -22,10 +22,10 @@ adminsuidsetup $user;
 
 my $access_user = new FS::access_user {
   'username'  => $user,
-  '_password' => $password,
   'first'     => 'Firstname', # $opt_f || 
   'last'      => 'Lastname',  # $opt_l || 
 };
+$access_user->change_password_fields($password) if length($password);
 my $au_error = $access_user->insert;
 die $au_error if $au_error;