From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 16 Dec 2017 00:43:57 +0000 (-0800)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=94be7e58a807d822aaa34151c5da9346c976d7a0;hp=5c1e57f696a330f82231b485fe58491f537e587b

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

diff --git a/FS/FS/Password_Mixin.pm b/FS/FS/Password_Mixin.pm
index 122e3fd83..b29cf5713 100644
--- a/FS/FS/Password_Mixin.pm
+++ b/FS/FS/Password_Mixin.pm
@@ -82,7 +82,9 @@ sub is_password_allowed {
   return '' unless $self->get($self->primary_key); # for validating new passwords pre-insert
 
   #check against customer fields
-  my $cust_main = $self->cust_main;
+  my $cust_main = $self->table eq 'access_user'
+                    ? $self->user_cust_main
+                    : $self->cust_main;
   if ($cust_main) {
     my @words;
     # words from cust_main