diff --git a/templates/Includes/UserFormActionNav.ss b/templates/Includes/UserFormActionNav.ss
new file mode 100644
index 0000000..c63aee3
--- /dev/null
+++ b/templates/Includes/UserFormActionNav.ss
@@ -0,0 +1,7 @@
+<% if $Actions %>
+<nav class="Actions">
+	<% loop $Actions %>
+		$Field
+	<% end_loop %>
+</nav>
+<% end_if %>
\ No newline at end of file
diff --git a/templates/Includes/UserFormStepNav.ss b/templates/Includes/UserFormStepNav.ss
index da66d5e..61c1e7f 100644
--- a/templates/Includes/UserFormStepNav.ss
+++ b/templates/Includes/UserFormStepNav.ss
@@ -1,7 +1,5 @@
 <nav id="step-navigation" class="step-navigation">
 	<ul class="step-buttons">
-
-		<% if $Steps.Count > 1 %>
 		<%--
 			If JavaScript is disabled multi-step forms are displayed as a single page
 			so the 'prev' and 'next' button are not used. These buttons are made visible via JavaScript.
@@ -12,7 +10,6 @@
 		<li class="step-button-wrapper" aria-hidden="true" style="display:none;">
 			<button class="step-button-next">Next</button>
 		</li>
-		<% end_if %>
 
 		<% if $Actions %>
 		<li class="step-button-wrapper Actions">
@@ -23,4 +20,4 @@
 		<% end_if %>
 
 	</ul>
-</nav>
+</nav>
\ No newline at end of file
diff --git a/templates/UserForm.ss b/templates/UserForm.ss
index 1810b1e..852e967 100644
--- a/templates/UserForm.ss
+++ b/templates/UserForm.ss
@@ -17,6 +17,10 @@
 	<div class="clear"><!-- --></div>
 </fieldset>
 
-<% include UserFormStepNav %>
+<% if $Steps.Count > 1 %>
+	<% include UserFormStepNav %>
+<% else %>
+	<% include UserFormActionNav %>
+<% end_if %>
 
 </form>