fixed currentuser issue