diff --git a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php
index 599438a..4ab0689 100644
--- a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php
+++ b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php
@@ -182,12 +182,11 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
                  * Client roles options
                  */
                 $client_roles_option = array();
-                $client_roles_list = wp_roles();
+                $client_roles_list = wp_roles()->get_names();
 
-
-                if ($client_roles_list && !empty($client_roles_list->get_names())) {
-                    foreach ($client_roles_list->get_names() as $code => $name) {
-                        $client_roles_option[$code] =$name;
+                if (!empty($client_roles_list)) {
+                    foreach ($client_roles_list as $code => $name) {
+                        $client_roles_option[$code] = $name;
                     }
 
                     $this->form_fields[] = array(
diff --git a/src/include/class-wc-retailcrm-customers.php b/src/include/class-wc-retailcrm-customers.php
index e5a71aa..f7c4367 100644
--- a/src/include/class-wc-retailcrm-customers.php
+++ b/src/include/class-wc-retailcrm-customers.php
@@ -621,10 +621,12 @@ if (!class_exists('WC_Retailcrm_Customers')) :
          */
         public function isCustomer($user)
         {
-            if (empty($this->retailcrm_settings['client_roles']))
-                $selectedRoles = [self::CUSTOMER_ROLE, self::ADMIN_ROLE];
+            $retailcrmSettings = $this->retailcrm_settings['client_roles'];
+
+            if (empty($retailcrmSettings))
+                $selectedRoles = array(self::CUSTOMER_ROLE, self::ADMIN_ROLE);
             else
-                $selectedRoles = $this->retailcrm_settings['client_roles'];
+                $selectedRoles = $retailcrmSettings;
 
             if ($user instanceof WP_User) {
                 $userRoles = $user->roles;