fix current user stuff