--- a/app/soc/templates/soc/models/edit.html	Wed May 20 12:32:36 2009 +0200
+++ b/app/soc/templates/soc/models/edit.html	Thu May 21 13:25:11 2009 +0200
@@ -58,11 +58,17 @@
    {% endif %}
    {% endblock %}
    <td>
-   {% if edit_cancel_redirect %}
-   <input type="button" onclick="location.href='{{ edit_cancel_redirect }}'" value="Cancel"/>
-   {% else %}
-   <input type="button" value="Back to Previous Page" onClick="javascript: history.go(-1)">
-   {% endif %}
+     {% if cancel_redirect %}
+     <input type="button" 
+       {% if entity %}
+       onclick="location.href='{{ cancel_redirect }}'" 
+       {% else %}
+       onClick="javascript: history.go(-1)">
+       {% endif %}
+     value="Cancel"/>
+     {% else %}
+     <input type="button" value="Back to Previous Page" onClick="javascript:history.go(-1)">
+     {% endif %}
    </td>
    {% if entity %}
    {% block delete_button %}