drupal-2345611/2345611-load-user-entity : Re-roll the Patch #152 For The latest version with teh addresed the #151 points.
Closes #2345611