diff --git a/javascript/UserForm.js b/javascript/UserForm.js
index 1a4a4f3..f4bc055 100644
--- a/javascript/UserForm.js
+++ b/javascript/UserForm.js
@@ -322,6 +322,7 @@ jQuery(function ($) {
 
 		this.$el = element instanceof jQuery ? element : $(element);
 		this.$buttons = this.$el.find('.step-button-jump');
+		this.$jsAlign = this.$el.find('.js-align');
 
 		// Update the progress bar when 'step' buttons are clicked.
 		this.$buttons.each(function (i, stepButton) {
@@ -337,9 +338,9 @@ jQuery(function ($) {
 		});
 
 		// Spaces out the steps below progress bar evenly
-		this.$buttons.each(function (index, button) {
+		this.$jsAlign.each(function (index, button) {
 			var $button = $(button),
-				leftPercent = (100 / (self.$buttons.length - 1) * index + '%'),
+				leftPercent = (100 / (self.$jsAlign.length - 1) * index + '%'),
 				buttonOffset = -1 * ($button.innerWidth() / 2);
 
 			$button.css({left: leftPercent, marginLeft: buttonOffset});
diff --git a/templates/Includes/UserFormProgress.ss b/templates/Includes/UserFormProgress.ss
index 0af9a18..7496a89 100644
--- a/templates/Includes/UserFormProgress.ss
+++ b/templates/Includes/UserFormProgress.ss
@@ -10,7 +10,7 @@
 		<ul class="step-buttons">
 			<% loop $NumberOfSteps %>
 				<li class="step-button-wrapper<% if $Pos == '1' %> current<% end_if %>">
-					<button class="step-button-jump" disabled="disabled">$Pos</button>
+					<button class="step-button-jump js-align" disabled="disabled">$Pos</button><!-- Remove js-align class to remove javascript positioning -->
 				</li>
 			<% end_loop %>
 		<ul>