currentuser fixed