From b2cfc9c0036c3f6610c46563c454f46309da132d Mon Sep 17 00:00:00 2001
From: Andreas Granig <agranig@sipwise.com>
Date: Wed, 28 Jan 2015 14:15:22 +0100
Subject: [PATCH] MT#10879 Set uuid as mailbox user if no number.

Change-Id: Ibb6d083d664c4aa8e51459d7460e141581a419a3
---
 lib/NGCP/Panel/Utils/Subscriber.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/NGCP/Panel/Utils/Subscriber.pm b/lib/NGCP/Panel/Utils/Subscriber.pm
index 7859d97b48..10ba0433af 100644
--- a/lib/NGCP/Panel/Utils/Subscriber.pm
+++ b/lib/NGCP/Panel/Utils/Subscriber.pm
@@ -472,7 +472,6 @@ sub update_subscriber_numbers {
         $billing_subs->update({
             primary_number_id => undef,
         });
-        update_voicemail_number(schema => $schema, subscriber => $billing_subs);
 
         if(defined $acli_pref) {
             $acli_pref->delete;
@@ -495,6 +494,7 @@ sub update_subscriber_numbers {
                 $cfset->delete;
             }
         }
+        update_voicemail_number(schema => $schema, subscriber => $billing_subs);
 
     } elsif(defined $primary_number) {
 
@@ -1229,7 +1229,7 @@ sub update_voicemail_number {
         my $n = $subscriber->primary_number;
         $new_cli = $n->cc . ($n->ac // '') . $n->sn;
     } else {
-        $new_cli = '0';
+        $new_cli = $subscriber->uuid;
     }
 
     if (defined $voicemail_user) {