diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index ff50a8e..1e8c57a 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -34,7 +34,7 @@
   <div id="header-register-form" class="modal hide fade">
     <div class="modal-header">
       <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-      <h3><%= _('Sign up')%></h3>
+      <h3><%= _('Create account')%></h3>
     </div>
     <div class="modal-body">
 			<% javascript "shared/register_form.js" %>
diff --git a/app/views/layouts/_signin_signout.html.erb b/app/views/layouts/_signin_signout.html.erb
index b902f0f..8da018c 100644
--- a/app/views/layouts/_signin_signout.html.erb
+++ b/app/views/layouts/_signin_signout.html.erb
@@ -31,7 +31,7 @@
       <li>
         <% unless controller_name == "home" && action_name == "index" then %>
           <a href="#header-login-form" data-toggle="modal"><%= _('Sign in')%></a> /
-          <a href="#header-register-form" data-toggle="modal"><%= _('Sign up')%></a>
+          <a href="#header-register-form" data-toggle="modal"><%= _('Create account')%></a>
         <% else %>
           <%= raw "&nbsp;" %>
         <% end %>
diff --git a/app/views/shared/_login_form.html.erb b/app/views/shared/_login_form.html.erb
index b97f05d..0c9d483 100644
--- a/app/views/shared/_login_form.html.erb
+++ b/app/views/shared/_login_form.html.erb
@@ -1,4 +1,4 @@
-<h2 aria-hidden="false" style="visibility: none"><%= _('Sign in') %></h2>
+<h2 aria-hidden="false" class="aria-only"><%= _('Sign in') %></h2>
 
 <%= form_for resource, as: 'user', url: user_session_path, html: {class: "login-form roadmap-form"} do |f| %>
   <fieldset id="sign-in-form" class="standard padded">
diff --git a/app/views/shared/_register_form.html.erb b/app/views/shared/_register_form.html.erb
index 4d72051..62c4f85 100644
--- a/app/views/shared/_register_form.html.erb
+++ b/app/views/shared/_register_form.html.erb
@@ -1,4 +1,4 @@
-<h2 aria-hidden="false" style="visibility: none"><%= _('Create account') %></h2>
+<h2 aria-hidden="false" class="aria-only"><%= _('Create account') %></h2>
 
 <%= form_for resource, as: 'user', url: registration_path("user"), html: {autocomplete: "off", class: "roadmap-form register-form"} do |f| %>
   <fieldset id="create-account-form" class="standard padded">
diff --git a/lib/assets/javascripts/shared/login_form.js b/lib/assets/javascripts/shared/login_form.js
index fb43e02..0fe6822 100644
--- a/lib/assets/javascripts/shared/login_form.js
+++ b/lib/assets/javascripts/shared/login_form.js
@@ -1,42 +1,44 @@
 $(document).ready(function(){
-  // If the hidden valid-form field is set to true then enable the submit button
-  $("form.login-form #valid-form").change(function(){
-    $(this).siblings(".form-submit").attr('aria-disabled', $(this).val() != "true");
-  });
+  if($("form.login-form").length > 0){
+    // If the hidden valid-form field is set to true then enable the submit button
+    $("form.login-form #valid-form").change(function(){
+      $(this).siblings(".form-submit").attr('aria-disabled', $(this).val() != "true");
+    });
 
-  // See if we should enable the submit button when a required input changes
-  $("form.login-form input[class*='required']").on('change keyup', function(){
-    toggleLogInSubmit();
-  });
+    // See if we should enable the submit button when a required input changes
+    $("form.login-form input[class*='required']").on('change keyup', function(){
+      toggleLogInSubmit();
+    });
 
-  // Run the input validations when the focus changes
-  $("form.login-form #user_email").on('blur', function(){
-    toggleInputError(this, validateEmail($(this).val().trim()));
-  });
-  $("form.login-form #user_password").on('blur', function(){
-    toggleInputError(this, validatePassword($(this).val().trim()));
-  });
+    // Run the input validations when the focus changes
+    $("form.login-form #user_email").on('blur', function(){
+      toggleInputError(this, validateEmail($(this).val().trim()));
+    });
+    $("form.login-form #user_password").on('blur', function(){
+      toggleInputError(this, validatePassword($(this).val().trim()));
+    });
   
-  // Toggle the password field so that its visible/masked
-  $("form.login-form #password_show").click(function(){
-    let typ = $("form.login-form #user_password").attr('type');
-    $("form.login-form #user_password").attr('type', (typ === 'password' ? 'text' : 'password'));
-  });
+    // Toggle the password field so that its visible/masked
+    $("form.login-form #password_show").click(function(){
+      let typ = $("form.login-form #user_password").attr('type');
+      $("form.login-form #user_password").attr('type', (typ === 'password' ? 'text' : 'password'));
+    });
   
-  // Run the validations in case the page was refreshed
-  toggleInputError($("form.login-form #user_email"), 
-                   validateEmail($("form.login-form #user_email").val().trim()));
-  toggleInputError($("form.login-form #user_password"), 
-                   validatePassword($("form.login-form #user_password").val().trim()));
+    // Run the validations in case the page was refreshed
+    toggleInputError($("form.login-form #user_email"), 
+                     validateEmail($("form.login-form #user_email").val().trim()));
+    toggleInputError($("form.login-form #user_password"), 
+                     validatePassword($("form.login-form #user_password").val().trim()));
+    
+    // Make sure the show password checkbox is unchecked on load
+    $("form.login-form #password_show").attr("checked", false);
   
-  // Make sure the show password checkbox is unchecked on load
-  $("form.login-form #password_show").attr("checked", false);
-  
-  // Display the submit button only if there is a valid email and password
-  function toggleLogInSubmit(){
-    let disabled = (validateEmail($("form.login-form #user_email").val()) != '' || 
-                    validatePassword($("form.login-form #user_password").val()) != '');
-    $("form.login-form #sign-in-button").attr('aria-disabled', disabled);
+    // Display the submit button only if there is a valid email and password
+    function toggleLogInSubmit(){
+      let disabled = (validateEmail($("form.login-form #user_email").val()) != '' || 
+                      validatePassword($("form.login-form #user_password").val()) != '');
+      $("form.login-form #sign-in-button").attr('aria-disabled', disabled);
+    }
   }
 });
 
diff --git a/lib/assets/javascripts/shared/register_form.js b/lib/assets/javascripts/shared/register_form.js
index 3778997..a33441b 100644
--- a/lib/assets/javascripts/shared/register_form.js
+++ b/lib/assets/javascripts/shared/register_form.js
@@ -1,54 +1,56 @@
 $(document).ready(function(){
-  // If the hidden valid-form field is set to true then enable the submit button
-  $("form.register-form #valid-form").change(function(){
-    $(this).siblings(".form-submit").attr('aria-disabled', $(this).val() != "true");
-  });
+  if($("form.register-form").length > 0){
+    // If the hidden valid-form field is set to true then enable the submit button
+    $("form.register-form #valid-form").change(function(){
+      $(this).siblings(".form-submit").attr('aria-disabled', $(this).val() != "true");
+    });
 
-  // See if we should enable the submit button when a required input changes
-  $("form.register-form input[class*='required']").on('change keyup', function(){
-    toggleRegisterSubmit();
-  });
+    // See if we should enable the submit button when a required input changes
+    $("form.register-form input[class*='required']").on('change keyup', function(){
+      toggleRegisterSubmit();
+    });
   
-  // Run the input validations when the focus changes
-  $("form.register-form #user_email, form.register-form #user_recovery_email").on('blur change', function(){
-    let msg = validateEmail($(this).val().trim());
-    // If the standard email validation was successful validate that they do not match
-    toggleInputError(this, (msg != '' ? msg : validateEmailsDoNotMatch()));
-  });
-  $("form.register-form #user_password").on('blur change', function(){
-    toggleInputError(this, validatePassword($(this).val().trim()));
-  });
+    // Run the input validations when the focus changes
+    $("form.register-form #user_email, form.register-form #user_recovery_email").on('blur change', function(){
+      let msg = validateEmail($(this).val().trim());
+      // If the standard email validation was successful validate that they do not match
+      toggleInputError(this, (msg != '' ? msg : validateEmailsDoNotMatch()));
+    });
+    $("form.register-form #user_password").on('blur change', function(){
+      toggleInputError(this, validatePassword($(this).val().trim()));
+    });
   
-  // Toggle the password field so that its visible/masked
-  $("form.register-form #password_show").click(function(){
-    let typ = $("form.register-form #user_password").attr('type');
-    $("form.register-form #user_password").attr('type', (typ === 'password' ? 'text' : 'password'));
-  });
+    // Toggle the password field so that its visible/masked
+    $("form.register-form #password_show").click(function(){
+      let typ = $("form.register-form #user_password").attr('type');
+      $("form.register-form #user_password").attr('type', (typ === 'password' ? 'text' : 'password'));
+    });
   
-  // Run the validations in case the page was refreshed
-  toggleInputError($("form.register-form #user_email"), 
-                   validateEmail($("form.register-form #user_email").val().trim()));
-  toggleInputError($("form.register-form #user_recovery_email"), 
-                   validateEmail($("form.register-form #user_recovery_email").val().trim()));
-  toggleInputError($("form.register-form #user_password"), 
-                   validatePassword($("form.register-form #user_password").val().trim()));
+    // Run the validations in case the page was refreshed
+    toggleInputError($("form.register-form #user_email"), 
+                     validateEmail($("form.register-form #user_email").val().trim()));
+    toggleInputError($("form.register-form #user_recovery_email"), 
+                     validateEmail($("form.register-form #user_recovery_email").val().trim()));
+    toggleInputError($("form.register-form #user_password"), 
+                     validatePassword($("form.register-form #user_password").val().trim()));
   
-  // Make sure the show password checkbox is unchecked on load
-  $("form.register-form #password_show").attr("checked", false);
+    // Make sure the show password checkbox is unchecked on load
+    $("form.register-form #password_show").attr("checked", false);
 
-  function validateEmailsDoNotMatch(){
-    let email = $("form.register-form #user_email").val().trim();
-    let recovery = $("form.register-form #user_recovery_email").val().trim();
-    return (email === recovery ? (email != '' ? __('Emails must be different') : '') : '');
-  }
+    function validateEmailsDoNotMatch(){
+      let email = $("form.register-form #user_email").val().trim();
+      let recovery = $("form.register-form #user_recovery_email").val().trim();
+      return (email === recovery ? (email != '' ? __('Emails must be different') : '') : '');
+    }
 
-  function toggleRegisterSubmit(){
-    let disabled = ($("form.register-form #user_firstname").val().trim().length <= 0 || 
-                    $("form.register-form #user_surname").val().trim().length <= 0 || 
-                    validateEmail($("form.register-form #user_email").val()) != '' || 
-                    validateEmail($("form.register-form #user_recovery_email").val()) != '' || 
-                    !$("form.register-form #user_accept_terms").prop('checked') ||
-                    $("form.register-form #user_email").val() === $("form.register-form #user_recovery_email").val());
-    $("form.register-form #register-button").attr('aria-disabled', disabled);
+    function toggleRegisterSubmit(){
+      let disabled = ($("form.register-form #user_firstname").val().trim().length <= 0 || 
+                      $("form.register-form #user_surname").val().trim().length <= 0 || 
+                      validateEmail($("form.register-form #user_email").val()) != '' || 
+                      validateEmail($("form.register-form #user_recovery_email").val()) != '' || 
+                      !$("form.register-form #user_accept_terms").prop('checked') ||
+                      $("form.register-form #user_email").val() === $("form.register-form #user_recovery_email").val());
+      $("form.register-form #register-button").attr('aria-disabled', disabled);
+    }
   }
 });
diff --git a/lib/assets/stylesheets/roadmap.scss b/lib/assets/stylesheets/roadmap.scss
index 7471041..7e2b999 100644
--- a/lib/assets/stylesheets/roadmap.scss
+++ b/lib/assets/stylesheets/roadmap.scss
@@ -23,6 +23,14 @@
   @extend .fa-#{$icon}:before;
 }
 
+/* This class will ensure that the item is hidden for sighted users and that it does not take up space */
+/* For example:  <h2 aria-hidden="false" class="aria-only"><%= _('Create account') %></h2> */
+.aria-only {
+  visibility: hidden;
+  height: 0;
+  width: 0;
+}
+
 .primary-color {
   color: $primary-color;
 }