From 832ae1aae9af2f15dc9b513c6505db25462ac511 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 6 May 2015 19:09:10 -0700
Subject: [PATCH] don't send when password is supplied, RT#34705

---
 FS/FS/contact.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/FS/contact.pm b/FS/FS/contact.pm
index e004cf8eb..96632ff49 100644
--- a/FS/FS/contact.pm
+++ b/FS/FS/contact.pm
@@ -179,7 +179,7 @@ sub insert {
     }
   }
 
-  if ( $self->selfservice_access ) {
+  if ( $self->selfservice_access && ! length($self->_password) ) {
     my $error = $self->send_reset_email( queue=>1 );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-- 
2.11.0