diff --git a/treasureapp/templates/accounts/form.html b/treasureapp/templates/accounts/form.html
index a389b69..83afd5b 100644
--- a/treasureapp/templates/accounts/form.html
+++ b/treasureapp/templates/accounts/form.html
@@ -1,10 +1,15 @@
 {% extends "base.html" %}
 {% load bootstrap %}
-{% block title %}Treasure Chest | Add account{% endblock %}
+
+{% block title %}{{Treasure Chest | Add/Update account"}{% endblock %}
 
 {% block content %}
 
-<h1>Add new account</h1>
+{% if mode == 'create' %}
+	<h1>Add new account</h1>
+{% elif mode == 'update' %}
+	<h1>Update existing account</h1>
+{% endif %}
 
 <form class="well" method="post">
     {% csrf_token %}
@@ -12,6 +17,7 @@ <h1>Add new account</h1>
     <div class="control-group">
         <div class="controls">
             <button type="submit" class="btn btn-primary">Save</button>
+            <a {% if mode == 'create' %} href="{% url account_list %}" {% else %} href="{% url account_detail account.pk %}" {% endif %} class="btn btn-primary">Cancel</a>
         </div>
     </div>
 </form>
diff --git a/treasureapp/templates/registration/registration_form.html b/treasureapp/templates/registration/registration_form.html
index d3a2748..af9b22d 100644
--- a/treasureapp/templates/registration/registration_form.html
+++ b/treasureapp/templates/registration/registration_form.html
@@ -11,6 +11,7 @@
     <div class="control-group">
         <div class="controls">
             <button type="submit" class="btn btn-primary">Sign Up</button>
+	    <a class="btn btn-primary" href="{% url index %}">Cancel</a>
         </div>
     </div>
 </form>
diff --git a/treasureapp/templates/transactions/form.html b/treasureapp/templates/transactions/form.html
index b4e6236..3824117 100644
--- a/treasureapp/templates/transactions/form.html
+++ b/treasureapp/templates/transactions/form.html
@@ -12,6 +12,7 @@ <h1>Transaction out of {{ account.name }}</h1>
     <div class="control-group">
         <div class="controls">
             <button type="submit" class="btn btn-primary">Save</button>
+            <a {% if mode == 'update' %} href="{% url transaction_detail transaction.pk %}" {% else %} href="{% url account_detail account.pk %}" {% endif %} class="btn btn-primary">Cancel</a>
         </div>
     </div>
 </form>
diff --git a/treasureapp/view/account.py b/treasureapp/view/account.py
index 9efbe70..d8cb8bb 100644
--- a/treasureapp/view/account.py
+++ b/treasureapp/view/account.py
@@ -81,7 +81,7 @@ def account_create(request, *args, **kargs):
 
 	# Update the CSRF token
 	kargs.update(csrf(request))
-	context = RequestContext(request, dict(section="accounts",
+	context = RequestContext(request, dict(section="accounts", mode = "create",
 		form=account_form, **kargs))
 	return render_to_response("accounts/form.html", context)
 
@@ -113,5 +113,5 @@ def account_update(request, account_id, *args, **kargs):
 	# Pass back the form we have, after updating CSRF
 	kargs.update(csrf(request))
 	context = RequestContext(request, dict(section="accounts",
-		form=account_form, **kargs))
+		form=account_form, mode="update", account=account, **kargs))
 	return render_to_response("accounts/form.html", context)
diff --git a/treasureapp/view/transaction.py b/treasureapp/view/transaction.py
index d6faaf5..8100c97 100644
--- a/treasureapp/view/transaction.py
+++ b/treasureapp/view/transaction.py
@@ -60,6 +60,7 @@ def transaction_create(request, account_id, *args, **kargs):
 	context = RequestContext(request, dict(section="accounts",
 		account=from_acct,
 		form=transaction_form,
+		mode='create',
 		**kargs))
 	return render_to_response("transactions/form.html", context)
 
@@ -93,5 +94,7 @@ def transaction_update(request, transaction_id, *args, **kargs):
 	context = RequestContext(request, dict(section="accounts",
 		account=transaction.from_acct,
 		form=transaction_form,
+		transaction=transaction,
+		mode='update',
 		**kargs))
 	return render_to_response("transactions/form.html", context)