--- a/app/soc/templates/soc/club_member/manage.html	Wed May 20 12:32:36 2009 +0200
+++ b/app/soc/templates/soc/club_member/manage.html	Thu May 21 13:25:11 2009 +0200
@@ -23,7 +23,17 @@
   <td>
     Please select the appropriate action:</br>
     <input type="button" onclick="location.href='/{{ url_name }}/manage/{{ entity.scope_path }}/{{ entity.link_id }}?resign=true'" value="Resign"/>
-    <input type="button" onclick="location.href='{{ cancel_redirect }}'" value="Cancel"/>
+    {% 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>
 </tr>
 {% endblock %}