diff --git a/CHANGES.txt b/CHANGES.txt
index 7b9588f..cb36366 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,8 @@
 Change List
 =========
+Version 1.4.18(Build 2022122200)
+- will return an empty string for custom user profile fields that exist but are empty (previously returned the unparsed variable name)
+
 Version 1.4.17(Build 2022121900)
 - Added non JQuery UI versions of tabs and accordians. Thanks @alexmorrisnz
 - Fixed issue with custom course variables not being picked up if no courseid specified.
diff --git a/filter.php b/filter.php
index cfd9418..e3f67fb 100644
--- a/filter.php
+++ b/filter.php
@@ -413,7 +413,7 @@ function filter_generico_callback(array $link) {
             }
 
             //if we have a propname and a propvalue, do the replace
-            if (!empty($userprop) && !empty($propvalue)) {
+            if (!empty($userprop) && !is_null($propvalue)) {
                 //echo "userprop:" . $userprop . '<br/>propvalue:' . $propvalue;
                 $genericotemplate = str_replace('@@USER:' . $userprop_allcase . '@@', $propvalue, $genericotemplate);
                 $dataset_vars = str_replace('@@USER:' . $userprop_allcase . '@@', $propvalue, $dataset_vars);
diff --git a/version.php b/version.php
index ab401c6..cdd640d 100644
--- a/version.php
+++ b/version.php
@@ -25,8 +25,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2022121900;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->version = 2022122200;        // The current plugin version (Date: YYYYMMDDXX)
 $plugin->requires = 2011070100;        // Requires this Moodle version
 $plugin->component = 'filter_generico'; // Full name of the plugin (used for diagnostics)
 $plugin->maturity = MATURITY_STABLE;
-$plugin->release = 'Version 1.4.17(Build 2022121900)';
+$plugin->release = 'Version 1.4.18(Build 2022122200)';