diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py
index 25e2f29c3..0801167bf 100644
--- a/app/main/views/service_settings.py
+++ b/app/main/views/service_settings.py
@@ -876,7 +876,10 @@ def service_preview_email_branding(service_id):
 @user_is_platform_admin
 def set_letter_branding(service_id):
 
-    form = LetterBranding(choices=email_branding_client.get_letter_email_branding().items())
+    form = LetterBranding(
+        choices=email_branding_client.get_letter_email_branding().items(),
+        dvla_org_id=current_service.dvla_organisation,
+    )
 
     if form.validate_on_submit():
         service_api_client.update_service(
@@ -885,8 +888,6 @@ def set_letter_branding(service_id):
         )
         return redirect(url_for('.service_settings', service_id=service_id))
 
-    form.dvla_org_id.data = current_service.dvla_organisation
-
     return render_template(
         'views/service-settings/set-letter-branding.html',
         form=form,