fix "no previous account to recall hidden password from" error when

adding new
accounts & get an error on first try

2 files changed, 3 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index dd134ebfc..283981a87 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-#TEMPLATE = asp
-TEMPLATE = mason
+TEMPLATE = asp
+#TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 73ecdd98d..4bc81c9fd 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -72,7 +72,7 @@ my $otaker = getotaker;
 my $username = $svc_acct->username;
 my $password;
 if ( $svc_acct->_password ) {
-  if ( $conf->exists('showpasswords') ) {
+  if ( $conf->exists('showpasswords') || ! $svcnum ) {
     $password = $svc_acct->_password;
   } else {
     $password = "*HIDDEN*";