fixed issue with current user being nil