Fixed bug with current user