diff --git a/lib/NGCP/Panel/Controller/Subscriber.pm b/lib/NGCP/Panel/Controller/Subscriber.pm
index 0fef48ec78..e4746e0a51 100644
--- a/lib/NGCP/Panel/Controller/Subscriber.pm
+++ b/lib/NGCP/Panel/Controller/Subscriber.pm
@@ -69,13 +69,13 @@ sub sub_list :Chained('/') :PathPart('subscriber') :CaptureArgs(0) {
     $c->stash->{subscribers_rs} = $c->model('DB')->resultset('voip_subscribers')->search({
         'me.status' => { '!=' => 'terminated' },
     });
-    if($c->user_in_realm('reseller')) {
+    if($c->user->roles eq 'reseller') {
         $c->stash->{subscribers_rs} = $c->stash->{subscribers_rs}->search({
             'contact.reseller_id' => $c->user->reseller_id,
         },{
             join => { 'contract' => 'contact'},
         });
-    } elsif($c->user_in_realm('subscriber') || $c->user_in_realm('subscriberadmin')) {
+    } elsif($c->user->roles eq 'subscriber' || $c->user->roles eq 'subscriberadmin') {
         $c->stash->{subscribers_rs} = $c->stash->{subscribers_rs}->search({
             'username' => $c->user->username
         },{
@@ -380,7 +380,7 @@ sub preferences_base :Chained('base') :PathPart('preferences') :CaptureArgs(1) {
     $c->stash->{preference_meta} = $c->model('DB')
         ->resultset('voip_preferences')
         ->single({id => $pref_id});
-     if(($c->user_in_realm('subscriber') || $c->user_in_realm('subscriberadmin')) &&
+     if(($c->user->roles eq 'subscriber' || $c->user->roles eq 'subscriberadmin') &&
         !$c->stash->{preference_meta}->expose_to_customer) {
 
         $c->log->error("invalid access to pref_id '$pref_id' by provisioning subscriber id '".$c->user->id."'");
@@ -1489,7 +1489,7 @@ sub load_preference_list :Private {
     NGCP::Panel::Utils::Preferences::load_preference_list( c => $c,
         pref_values => \%pref_values,
         usr_pref => 1,
-        customer_view => (($c->user_in_realm('subscriber') || $c->user_in_realm('subscriberadmin')) ? 1 : 0)
+        customer_view => (($c->user->roles eq 'subscriber' || $c->user->roles eq 'subscriberadmin') ? 1 : 0)
     );
 }
 
diff --git a/lib/NGCP/Panel/Form/Preferences.pm b/lib/NGCP/Panel/Form/Preferences.pm
index 11f8ce384a..2225d59185 100644
--- a/lib/NGCP/Panel/Form/Preferences.pm
+++ b/lib/NGCP/Panel/Form/Preferences.pm
@@ -25,8 +25,8 @@ has_block 'fields' => (
 sub field_list {
     my $self = shift;
 
-    my $is_subscriber = ($self->ctx->user_in_realm('subscriber') || 
-                         $self->ctx->user_in_realm('subscriberadmin'));
+    my $is_subscriber = ($self->ctx->user->roles eq 'subscriber' || 
+                         $self->ctx->user->roles eq 'subscriberadmin');
     
     my @field_list;
     my $fields_data = $self->fields_data;
diff --git a/lib/NGCP/Panel/Widget/Plugin/AdminBillingOverview.pm b/lib/NGCP/Panel/Widget/Plugin/AdminBillingOverview.pm
index 0570e46b08..4f729e972a 100644
--- a/lib/NGCP/Panel/Widget/Plugin/AdminBillingOverview.pm
+++ b/lib/NGCP/Panel/Widget/Plugin/AdminBillingOverview.pm
@@ -63,7 +63,7 @@ sub filter {
 
     return $self if(
         $type eq $self->type &&
-        $c->user_in_realm('admin') &&
+        $c->user->roles eq 'admin' &&
         ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
     );
     return;
diff --git a/lib/NGCP/Panel/Widget/Plugin/AdminPeeringOverview.pm b/lib/NGCP/Panel/Widget/Plugin/AdminPeeringOverview.pm
index 4b9472bdd1..c9379ff46f 100644
--- a/lib/NGCP/Panel/Widget/Plugin/AdminPeeringOverview.pm
+++ b/lib/NGCP/Panel/Widget/Plugin/AdminPeeringOverview.pm
@@ -40,7 +40,7 @@ sub filter {
 
     return $self if(
         $type eq $self->type &&
-        $c->user_in_realm('admin') &&
+        $c->user->roles eq 'admin' &&
         ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
     );
     return;
diff --git a/lib/NGCP/Panel/Widget/Plugin/AdminResellerOverview.pm b/lib/NGCP/Panel/Widget/Plugin/AdminResellerOverview.pm
index 52023004bd..2bdaf6fc45 100644
--- a/lib/NGCP/Panel/Widget/Plugin/AdminResellerOverview.pm
+++ b/lib/NGCP/Panel/Widget/Plugin/AdminResellerOverview.pm
@@ -45,7 +45,7 @@ sub filter {
 
     return $self if(
         $type eq $self->type &&
-        $c->user_in_realm('admin') &&
+        $c->user->roles eq 'admin' &&
         ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
     );
     return;
diff --git a/lib/NGCP/Panel/Widget/Plugin/AdminSystemOverview.pm b/lib/NGCP/Panel/Widget/Plugin/AdminSystemOverview.pm
index 04acade9f1..b640bc27c0 100644
--- a/lib/NGCP/Panel/Widget/Plugin/AdminSystemOverview.pm
+++ b/lib/NGCP/Panel/Widget/Plugin/AdminSystemOverview.pm
@@ -31,7 +31,7 @@ sub filter {
 
     return $self if(
         $type eq $self->type &&
-        $c->user_in_realm('admin') &&
+        $c->user->roles eq 'admin' &&
         ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
     );
     return;
diff --git a/lib/NGCP/Panel/Widget/Plugin/AdminTopMenuSettings.pm b/lib/NGCP/Panel/Widget/Plugin/AdminTopMenuSettings.pm
index 44cdc2c692..975b0aacff 100644
--- a/lib/NGCP/Panel/Widget/Plugin/AdminTopMenuSettings.pm
+++ b/lib/NGCP/Panel/Widget/Plugin/AdminTopMenuSettings.pm
@@ -23,7 +23,7 @@ sub filter {
 
     return $self if(
         $type eq $self->type &&
-        $c->user_in_realm('admin')
+        $c->user->roles eq 'admin'
     );
     return;
 }
diff --git a/lib/NGCP/Panel/Widget/Plugin/ResellerBillingOverview.pm b/lib/NGCP/Panel/Widget/Plugin/ResellerBillingOverview.pm
index a20ac38278..70433e6948 100644
--- a/lib/NGCP/Panel/Widget/Plugin/ResellerBillingOverview.pm
+++ b/lib/NGCP/Panel/Widget/Plugin/ResellerBillingOverview.pm
@@ -56,7 +56,7 @@ sub filter {
 
     return $self if(
         $type eq $self->type &&
-        $c->user_in_realm('reseller') &&
+        $c->user->roles eq 'reseller' &&
         ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
     );
     return;
diff --git a/lib/NGCP/Panel/Widget/Plugin/ResellerCustomerOverview.pm b/lib/NGCP/Panel/Widget/Plugin/ResellerCustomerOverview.pm
index 50a84fd87d..4c1b8846ae 100644
--- a/lib/NGCP/Panel/Widget/Plugin/ResellerCustomerOverview.pm
+++ b/lib/NGCP/Panel/Widget/Plugin/ResellerCustomerOverview.pm
@@ -50,7 +50,7 @@ sub filter {
 
     return $self if(
         $type eq $self->type &&
-        $c->user_in_realm('reseller') &&
+        $c->user->roles eq 'reseller' &&
         ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
     );
     return;
diff --git a/lib/NGCP/Panel/Widget/Plugin/ResellerDomainOverview.pm b/lib/NGCP/Panel/Widget/Plugin/ResellerDomainOverview.pm
index d52999a4a3..f772c932d3 100644
--- a/lib/NGCP/Panel/Widget/Plugin/ResellerDomainOverview.pm
+++ b/lib/NGCP/Panel/Widget/Plugin/ResellerDomainOverview.pm
@@ -37,7 +37,7 @@ sub filter {
 
     return $self if(
         $type eq $self->type &&
-        $c->user_in_realm('reseller') &&
+        $c->user->roles eq 'reseller' &&
         ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
     );
     return;
diff --git a/lib/NGCP/Panel/Widget/Plugin/ResellerTopMenuSettings.pm b/lib/NGCP/Panel/Widget/Plugin/ResellerTopMenuSettings.pm
index 8e278ee5c2..b637f28365 100644
--- a/lib/NGCP/Panel/Widget/Plugin/ResellerTopMenuSettings.pm
+++ b/lib/NGCP/Panel/Widget/Plugin/ResellerTopMenuSettings.pm
@@ -23,7 +23,7 @@ sub filter {
 
     return $self if(
         $type eq $self->type &&
-        $c->user_in_realm('reseller')
+        $c->user->roles eq 'reseller'
     );
     return;
 }
diff --git a/lib/NGCP/Panel/Widget/Plugin/SubscriberAdminTopMenuSettings.pm b/lib/NGCP/Panel/Widget/Plugin/SubscriberAdminTopMenuSettings.pm
index 65bec118f9..f69f9a36d1 100644
--- a/lib/NGCP/Panel/Widget/Plugin/SubscriberAdminTopMenuSettings.pm
+++ b/lib/NGCP/Panel/Widget/Plugin/SubscriberAdminTopMenuSettings.pm
@@ -23,7 +23,7 @@ sub filter {
 
     return $self if(
         $type eq $self->type &&
-        $c->user_in_realm('subscriberadmin')
+        $c->user->roles eq 'subscriberadmin'
     );
     return;
 }
diff --git a/lib/NGCP/Panel/Widget/Plugin/SubscriberCFOverview.pm b/lib/NGCP/Panel/Widget/Plugin/SubscriberCFOverview.pm
index e876c33dc9..5b1416f78e 100644
--- a/lib/NGCP/Panel/Widget/Plugin/SubscriberCFOverview.pm
+++ b/lib/NGCP/Panel/Widget/Plugin/SubscriberCFOverview.pm
@@ -56,7 +56,7 @@ sub filter {
 
     return $self if(
         $type eq $self->type &&
-        ($c->user_in_realm('subscriber') || $c->user_in_realm('subscriberadmin')) &&
+        ($c->user->roles eq 'subscriber' || $c->user->roles eq 'subscriberadmin') &&
         ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
     );
     return;
diff --git a/lib/NGCP/Panel/Widget/Plugin/SubscriberCallsOverview.pm b/lib/NGCP/Panel/Widget/Plugin/SubscriberCallsOverview.pm
index 6310a93231..645a6749a7 100644
--- a/lib/NGCP/Panel/Widget/Plugin/SubscriberCallsOverview.pm
+++ b/lib/NGCP/Panel/Widget/Plugin/SubscriberCallsOverview.pm
@@ -43,7 +43,7 @@ sub filter {
 
     return $self if(
         $type eq $self->type &&
-        ($c->user_in_realm('subscriber') || $c->user_in_realm('subscriberadmin')) &&
+        ($c->user->roles eq 'subscriber' || $c->user->roles eq 'subscriberadmin') &&
         ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
     );
     return;
diff --git a/lib/NGCP/Panel/Widget/Plugin/SubscriberRegisterOverview.pm b/lib/NGCP/Panel/Widget/Plugin/SubscriberRegisterOverview.pm
index dd410dc537..b4b7eae26f 100644
--- a/lib/NGCP/Panel/Widget/Plugin/SubscriberRegisterOverview.pm
+++ b/lib/NGCP/Panel/Widget/Plugin/SubscriberRegisterOverview.pm
@@ -45,7 +45,7 @@ sub filter {
 
     return $self if(
         $type eq $self->type &&
-        ($c->user_in_realm('subscriber') || $c->user_in_realm('subscriberadmin')) &&
+        ($c->user->roles eq 'subscriber' || $c->user->roles eq 'subscriberadmin') &&
         ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
     );
     return;
diff --git a/lib/NGCP/Panel/Widget/Plugin/SubscriberTopMenuSettings.pm b/lib/NGCP/Panel/Widget/Plugin/SubscriberTopMenuSettings.pm
index 5d47e7a390..b74c5923d5 100644
--- a/lib/NGCP/Panel/Widget/Plugin/SubscriberTopMenuSettings.pm
+++ b/lib/NGCP/Panel/Widget/Plugin/SubscriberTopMenuSettings.pm
@@ -23,7 +23,7 @@ sub filter {
 
     return $self if(
         $type eq $self->type &&
-        $c->user_in_realm('subscriber')
+        $c->user->roles eq 'subscriber'
     );
     return;
 }
diff --git a/lib/NGCP/Panel/Widget/Plugin/SubscriberVmOverview.pm b/lib/NGCP/Panel/Widget/Plugin/SubscriberVmOverview.pm
index 6c0665128e..c0ec641168 100644
--- a/lib/NGCP/Panel/Widget/Plugin/SubscriberVmOverview.pm
+++ b/lib/NGCP/Panel/Widget/Plugin/SubscriberVmOverview.pm
@@ -45,7 +45,7 @@ sub filter {
 
     return $self if(
         $type eq $self->type &&
-        ($c->user_in_realm('subscriber') || $c->user_in_realm('subscriberadmin')) &&
+        ($c->user->roles eq 'subscriber' || $c->user->roles eq 'subscriberadmin') &&
         ref $c->controller eq 'NGCP::Panel::Controller::Dashboard'
     );
     return;
diff --git a/share/layout/body.tt b/share/layout/body.tt
index 575c306246..5a3b16bee9 100644
--- a/share/layout/body.tt
+++ b/share/layout/body.tt
@@ -11,7 +11,7 @@
                 <ul class="pull-right">
                     <li>
                       <i class="icon-user"></i> Logged in as 
-                      [% IF c.user_in_realm('admin') || c.user_in_realm('reseller') -%]
+                      [% IF c.user.roles == 'admin' || c.user.roles == 'reseller' -%]
                         [% c.user.login %]
                       [% ELSE -%]
                         [% c.user.webusername %]@[% c.user.domain.domain %]
diff --git a/share/templates/helpers/pref_table.tt b/share/templates/helpers/pref_table.tt
index 9301c6de88..a7619ff866 100644
--- a/share/templates/helpers/pref_table.tt
+++ b/share/templates/helpers/pref_table.tt
@@ -33,7 +33,7 @@
         <tr>
             [% # one for description -%]
             <th></th>
-            [% UNLESS c.user_in_realm('subscriber') || c.user_in_realm('subscriberadmin') -%]
+            [% UNLESS c.user.roles == 'subscriber' || c.user.roles == 'subscriberadmin' -%]
             <th>Attribute</th>
             [% END -%]
             <th>Name</th>
@@ -56,7 +56,7 @@
                             ]
                         }); return false;"><i class="icon-question-sign"></i></a>
                 </td>
-                [% UNLESS c.user_in_realm('subscriber') || c.user_in_realm('subscriberadmin') -%]
+                [% UNLESS c.user.roles == 'subscriber' || c.user.roles == 'subscriberadmin' -%]
                 <td>[% r.attribute %]</td>
                 [% END -%]
                 <td>
diff --git a/share/templates/subscriber/preferences.tt b/share/templates/subscriber/preferences.tt
index 993618d78a..444149799c 100644
--- a/share/templates/subscriber/preferences.tt
+++ b/share/templates/subscriber/preferences.tt
@@ -365,7 +365,7 @@
         </div>
     </div>
 
-[% UNLESS c.user_in_realm('subscriber') || c.user_in_realm('subscriberadmin') -%]
+[% UNLESS c.user.roles == 'subscriber' || c.user.roles == 'subscriberadmin' -%]
     <div class="accordion-group">
         <div class="accordion-heading">
             <a class="accordion-toggle" data-toggle="collapse" data-parent="#preference_groups" href="#collapse_ts">Trusted Sources</a>