diff --git a/lib/NGCP/Panel.pm b/lib/NGCP/Panel.pm
index 523db5ed8f..f94c020466 100644
--- a/lib/NGCP/Panel.pm
+++ b/lib/NGCP/Panel.pm
@@ -83,6 +83,18 @@ __PACKAGE__->config(
     },
 
     'Plugin::Authentication' => {
+        default => {
+            credential => {
+                class => 'Password',
+                password_field => 'password',
+                password_type => 'clear'
+            },
+            store => {
+                class => 'Minimal',
+                users => {
+                }
+            }
+        },
         reseller => {
             credential => {
                 class => 'Password',
diff --git a/lib/NGCP/Panel/Controller/Subscriber.pm b/lib/NGCP/Panel/Controller/Subscriber.pm
index 8c42a403d6..12cad30d83 100644
--- a/lib/NGCP/Panel/Controller/Subscriber.pm
+++ b/lib/NGCP/Panel/Controller/Subscriber.pm
@@ -2130,6 +2130,7 @@ sub ajax_voicemails :Chained('master') :PathPart('voicemails/ajax') :Args(0) {
 
     my $vm_rs = $c->model('DB')->resultset('voicemail_spool')->search({
         mailboxuser => $c->stash->{subscriber}->uuid,
+        msgnum => { '>=' => 0 },
     });
     NGCP::Panel::Utils::Datatables::process($c, $vm_rs, $c->stash->{vm_dt_columns});
 
diff --git a/lib/NGCP/Panel/Widget/Plugin/SubscriberVmOverview.pm b/lib/NGCP/Panel/Widget/Plugin/SubscriberVmOverview.pm
index 6ebeaf8b90..e690390c50 100644
--- a/lib/NGCP/Panel/Widget/Plugin/SubscriberVmOverview.pm
+++ b/lib/NGCP/Panel/Widget/Plugin/SubscriberVmOverview.pm
@@ -22,14 +22,19 @@ has 'priority' => (
 around handle => sub {
     my ($foo, $self, $c) = @_;
 
+    my $sub = $c->model('DB')->resultset('voip_subscribers')->find({
+        uuid => $c->user->uuid,
+    });
     my $rs = $c->model('DB')->resultset('voicemail_spool')->search({
         mailboxuser => $c->user->uuid,
+        msgnum => { '>=' => 0 },
         dir => { -like => '%/INBOX' },
     }, {
         order_by => { -desc => 'me.origtime' },
     })->slice(0, 9);
 
     $c->stash(
+        subscriber => $sub,
         vmails => $rs,
     );
     return;
diff --git a/share/templates/widgets/subscriber_vm_overview.tt b/share/templates/widgets/subscriber_vm_overview.tt
index bba0cf19d3..7a66d9965a 100644
--- a/share/templates/widgets/subscriber_vm_overview.tt
+++ b/share/templates/widgets/subscriber_vm_overview.tt
@@ -17,7 +17,7 @@
                     <li>
                         <div class="row-fluid">
                         <span class="span1">
-                            <a href="#" alt="listen">
+                            <a href="[% c.uri_for_action('/subscriber/play_voicemail', [subscriber.id, vmail.id]) %]" alt="listen">
                                 <i class="icon-volume-up" style="color:green"></i>
                             </a>
                         </span>
@@ -31,7 +31,7 @@
             </ul>
         </div>
         <div class="plan-actions">
-            <a href="[% c.uri_for('/subscriber') %]" class="btn">View Call List</a>
+            <a href="[% c.uri_for('/subscriber') %]" class="btn">View Voicebox Messages</a>
         </div>
     </div>
 </div>