Fixed problem with current user