This can also be condensed:

```jinja2
{% if user.is_authenticated() %}
  <li id="nav-submit" class="logged-in">
    {{ browserid_logout(text=_('Sign out')) }}
  </li>
{% elif not waffle.flag('r3') %}
  <li id="nav-submit">
    {{ browserid_login(text=_('Submit your flick'), next=url('flicks.videos.upload')) }}
  </li>
{% endif %}
```