fixes current_user stuff