X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Faccess_user.html;h=c27262017e414f2e927666a9b45a222ff6b163a6;hb=07ed221540128b8c75f4cb5a2af1e01b25fa8e18;hp=bbe4268be70b274a42b1b3c632b5f4b971d672d1;hpb=450d0dec955bf6ae8d7acdc13a8bfc19777089d3;p=freeside.git

diff --git a/httemplate/edit/process/access_user.html b/httemplate/edit/process/access_user.html
index bbe4268be..c27262017 100644
--- a/httemplate/edit/process/access_user.html
+++ b/httemplate/edit/process/access_user.html
@@ -29,7 +29,7 @@ if ( FS::Conf->new->exists('disable_acl_changes') ) {
 sub precheck_callback {
   my $cgi = shift;
 
-  my $o = FS::access_user->new({username => $cgi->param('username')});
+  my $o = FS::access_user->new({username => scalar($cgi->param('username'))});
   if( $o->is_system_user and !$cgi->param('usernum') ) {
     $cgi->param('username','');
     return "username '".$o->username."' reserved for system account."
@@ -41,12 +41,14 @@ sub precheck_callback {
 sub post_new_object_callback {
   my( $cgi, $access_user ) = @_;
 
-  if ( length($cgi->param('_password')) ) {
-    my $password = scalar($cgi->param('_password'));
-    my $error = $access_user->is_password_allowed($password)
-             || $access_user->change_password($password);
-  }
+  return '' unless length($cgi->param('_password'));
+
+  my $password = scalar($cgi->param('_password'));
+  my $error = $access_user->is_password_allowed($password);
+  return $error if $error;
 
+  $access_user->change_password_fields($password);
+  '';
 }
 
 sub noerror_callback {