diff --git a/uw_cfg_common.module b/uw_cfg_common.module
index 8741e9eb48e3321770e99fbfb59f26d149bd2b90..6c537891762e5bc0ad65ee899b062700b4296676 100644
--- a/uw_cfg_common.module
+++ b/uw_cfg_common.module
@@ -195,7 +195,7 @@ function uw_cfg_common_toolbar_alter(&$items) {
     unset($items['administration']);
   }
   // Adjust toolbar for non-admin users.
-  elseif (!UWService::userIsAdmin($current_user)) {
+  if (!$current_user->hasPermission('access manage toolbar item')) {
     // Remove "Manage" toolbar item.
     unset($items['administration']);
     // Add links to "Workbench". 'dashboards' is renamed in