diff --git a/view/tpl/settings_addon.tpl b/view/tpl/settings_addon.tpl
index b5665f579..93bf3d083 100644
--- a/view/tpl/settings_addon.tpl
+++ b/view/tpl/settings_addon.tpl
@@ -3,11 +3,20 @@
 		<h2>{{$title}}</h2>
 	</div>
 	<div class="section-content-wrapper">
+		{{if $action_url}}
 		<form action="{{$action_url}}" method="post" autocomplete="off">
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		{{$content}}
-		<div class="settings-submit-wrapper" >
-			<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-		</div>
+		{{/if}}
+			{{if $form_security_token}}
+			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+			{{/if}}
+			{{$content}}
+			{{if $submit}}
+			<div class="settings-submit-wrapper" >
+				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+			</div>
+			{{/if}}
+		{{if $action_url}}
+		</form>
+		{{/if}}
 	</div>
 </div>