From: Mark Wells <mark@freeside.biz>
Date: Wed, 18 Nov 2015 08:09:29 +0000 (-0800)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=1daa37e733b9e972e5328503374130a423d02836;hp=46762f49fe399c99d2a42a9f7974ca059852fc75;p=freeside.git

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

diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
index d75ff92c1..17a035cdb 100755
--- a/httemplate/edit/process/svc_acct.cgi
+++ b/httemplate/edit/process/svc_acct.cgi
@@ -82,7 +82,7 @@ if (     $cgi->param('clear_password') eq '*HIDDEN*'
   die "fatal: no previous account to recall hidden password from!" unless $old;
 } else {
   my $newpass = $cgi->param('clear_password');
-  if ( ! $old->check_password($newpass) ) {
+  if ( !$old or ! $old->check_password($newpass) ) {
     # then the password is being changed
     $error ||= $new->is_password_allowed($newpass)
            ||  $new->set_password($newpass);