diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2f0f49..15e2cdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Error when 'Display name' not set
 
 ## [4.0.1] - 2018-08-11
 ### Fixed
diff --git a/lib/Query/QueryProvider.php b/lib/Query/QueryProvider.php
index 85a9f95..6600a2f 100644
--- a/lib/Query/QueryProvider.php
+++ b/lib/Query/QueryProvider.php
@@ -92,7 +92,7 @@ class QueryProvider implements \ArrayAccess
             (empty($gAdmin) ? "false" : $gAdmin) . " AS admin";
         $userColumns
             = "$uUID AS uid, " .
-            (empty($uName) ? "null" : $uName) . " AS name, " .
+            (empty($uName) ? $uUID : $uName) . " AS name, " .
             (empty($uEmail) ? "null" : $uEmail) . " AS email, " .
             (empty($uQuota) ? "null" : $uQuota) . " AS quota, " .
             (empty($uHome) ? "null" : $uHome) . " AS home, " .