diff --git a/includes/admin/templates/directory/general.php b/includes/admin/templates/directory/general.php
index ffbc02ac..9bde9b62 100644
--- a/includes/admin/templates/directory/general.php
+++ b/includes/admin/templates/directory/general.php
@@ -9,8 +9,9 @@ foreach( $meta as $k => $v ) {
 $roles_array = array();
 
 foreach ( UM()->roles()->get_roles() as $key => $value ) {
-	if ( ! empty( UM()->query()->get_meta_value( '_um_roles', $key ) ) )
-		$roles_array[] = UM()->query()->get_meta_value( '_um_roles', $key );
+    $_um_roles = UM()->query()->get_meta_value( '_um_roles', $key );
+	if ( ! empty( $_um_roles ) )
+		$roles_array[] = $_um_roles;
 }
 
 $show_these_users = get_post_meta( get_the_ID(), '_um_show_these_users', true );
diff --git a/includes/admin/templates/directory/search.php b/includes/admin/templates/directory/search.php
index 520c0647..0b85ca2a 100644
--- a/includes/admin/templates/directory/search.php
+++ b/includes/admin/templates/directory/search.php
@@ -2,8 +2,9 @@
 	<?php
 	$can_search_array = array();
 	foreach ( UM()->roles()->get_roles() as $key => $value ) {
-		if ( ! empty( UM()->query()->get_meta_value( '_um_roles_can_search', $key ) ) )
-			$can_search_array[] = UM()->query()->get_meta_value( '_um_roles_can_search', $key );
+	    $_um_roles_can_search = UM()->query()->get_meta_value( '_um_roles_can_search', $key );
+		if ( ! empty( $_um_roles_can_search ) )
+			$can_search_array[] = $_um_roles_can_search;
 	}
 
 	$custom_search = apply_filters( 'um_admin_custom_search_filters', array() );
diff --git a/includes/admin/templates/form/profile_customize.php b/includes/admin/templates/form/profile_customize.php
index 9ed7016a..06964965 100644
--- a/includes/admin/templates/form/profile_customize.php
+++ b/includes/admin/templates/form/profile_customize.php
@@ -2,8 +2,9 @@
 
 	<?php
 	foreach ( UM()->roles()->get_roles( __( 'All roles', 'ultimate-member' ) ) as $key => $value ) {
-		if ( ! empty( UM()->query()->get_meta_value( '_um_profile_role', $key ) ) )
-			$profile_role = UM()->query()->get_meta_value( '_um_profile_role', $key );
+	    $_um_profile_role = UM()->query()->get_meta_value( '_um_profile_role', $key );
+		if ( ! empty( $_um_profile_role ) )
+			$profile_role = $_um_profile_role;
 	}
 
 	UM()->admin_forms( array(
diff --git a/includes/admin/templates/form/register_customize.php b/includes/admin/templates/form/register_customize.php
index d2628881..98879594 100644
--- a/includes/admin/templates/form/register_customize.php
+++ b/includes/admin/templates/form/register_customize.php
@@ -2,8 +2,9 @@
 
 	<?php
 	foreach ( UM()->roles()->get_roles( __( 'Default', 'ultimate-member' ) ) as $key => $value ) {
-		if ( ! empty( UM()->query()->get_meta_value( '_um_register_role', $key ) ) )
-			$register_role = UM()->query()->get_meta_value( '_um_register_role', $key );
+		$_um_register_role = UM()->query()->get_meta_value( '_um_register_role', $key );
+	    if ( ! empty( $_um_register_role ) )
+			$register_role = $_um_register_role;
 	}
 
 	UM()->admin_forms( array(