diff --git a/app/main/forms.py b/app/main/forms.py
index fab516607..7a3ed88e7 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -194,7 +194,7 @@ class TemplateForm(Form):
         u'Template name',
         validators=[DataRequired(message="Template name cannot be empty")])
     template_type = SelectField(u'Template type', choices=[('sms', 'SMS')])
-    content = TextAreaField(
+    template_content = TextAreaField(
         u'Message',
         validators=[DataRequired(message="Template content cannot be empty")])
 
diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index 57866a839..a40d3b8f2 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -40,7 +40,7 @@ def add_service_template(service_id):
 
     if form.validate_on_submit():
         tdao.insert_service_template(
-            form.name.data, form.template_type.data, form.content.data, service_id)
+            form.name.data, form.template_type.data, form.template_content.data, service_id)
         return redirect(url_for(
             '.manage_service_templates', service_id=service_id))
     return render_template(
@@ -60,12 +60,14 @@ def edit_service_template(service_id, template_id):
             abort(404)
         else:
             raise e
+
+    template['template_content'] = template['content']
     form = TemplateForm(**template)
 
     if form.validate_on_submit():
         tdao.update_service_template(
             template_id, form.name.data, form.template_type.data,
-            form.content.data, service_id)
+            form.template_content.data, service_id)
         return redirect(url_for('.manage_service_templates', service_id=service_id))
 
     return render_template(
diff --git a/app/templates/views/edit-template.html b/app/templates/views/edit-template.html
index 861e7c4ea..bc991d5de 100644
--- a/app/templates/views/edit-template.html
+++ b/app/templates/views/edit-template.html
@@ -13,7 +13,7 @@ GOV.UK Notify | Edit template
 		<form method="post">
 			{{ textbox(form.name) }}
 			{{ textbox(form.template_type) }}
-			{{ textbox(form.content, highlight_tags=True) }}
+			{{ textbox(form.template_content, highlight_tags=True) }}
 			{{ page_footer(
 				'Save',
 				delete_link=url_for('.delete_service_template', service_id=service_id, template_id=template_id) if template_id or None,
diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py
index 13c3965a7..cdf7284cf 100644
--- a/tests/app/main/views/test_templates.py
+++ b/tests/app/main/views/test_templates.py
@@ -62,7 +62,7 @@ def test_should_redirect_when_saving_a_template(app_,
                 'id': template_id,
                 'name': name,
                 'template_type': type_,
-                "content": content,
+                "template_content": content,
                 "service": service_id
             }
             response = client.post(url_for(