Indentation Issues

[PuercoPop]

I don't know if I should file two separate issues or not. I intuit they are relaed

First issue about indentation

<ul class="nav pull-right">
  {% if user.is_authenticated %}
  <li><a href="/register/">Regístrate</a></li>
  {% else %}
    <li><a href="/register/">Regístrate</a></li>
  <li><a href="/login/">Login</a></li>
{% endif %}
</ul>

When it should look like this

<ul class="nav pull-right">
  {% if user.is_authenticated %}
  <li><a href="/register/">Regístrate</a></li>
  {% else %}
    <li><a href="/register/">Regístrate</a></li>
    <li><a href="/login/">Login</a></li>
  {% endif %}
</ul>

Althought it correctly indendents this

{% if user.is_authenticated %}
  <ul class="nav pull-right">      
      <li><a href="/register/">Regístrate</a></li>
  </ul>
{% else %}
  <ul class="nav pull-right">
    <li><a href="/register/">Regístrate</a></li>
    <li><a href="/login/">Login</a></li>
  </ul>
{% endif %}

The second issue is that pony-mode doesn't indent and prevents HTML-mode to indent if there are no characters on the line. Not even ctrl-j works.