fix: added missing check on current user object, closes #3302

fix: added missing check on current user object, closes #3302 #4460