diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 0572dd2..f920923 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,16 +1,4 @@
 class SessionsController < Devise::SessionsController
-
-  # POST /auth/:provider/callback
-  # ---------------------------------------------------------------------
-=begin
-  def oauth_create
-    existing_user = User.find_by_email(params[:user][:email])
-    
-    unless params[:omniauth].nil?
-      existing_user = UserIdentifier.find_by(identifier: params[:omniauth][:auth])
-    end
-  end
-=end
     
   # Capture the user's shibboleth id if they're coming in from an IDP
   # ---------------------------------------------------------------------
@@ -35,5 +23,4 @@
     session[:locale] = nil
     set_gettext_locale  #Method defined at controllers/application_controller.rb
   end
-  
 end
\ No newline at end of file
diff --git a/app/views/orgs/shibboleth_ds.html.erb b/app/views/orgs/shibboleth_ds.html.erb
index 0d6cbce..1358473 100644
--- a/app/views/orgs/shibboleth_ds.html.erb
+++ b/app/views/orgs/shibboleth_ds.html.erb
@@ -1,5 +1,3 @@
-<% javascript 'views/orgs/shibboleth_ds.js'%>
-
 <div class="row">
   <div class="col-md-12">
     <h1>Find your institution to sign in</h1>
@@ -42,8 +40,8 @@
       </div>
     <% end %>
   
-    <div id="full_list" style="display: none" class="left-indent" aria-hidden="true">
-      <div id="org-list">
+    <div id="full_list" class="hidden" aria-hidden="true">
+      <div class="row">
         <%
         increment, cols, letter, total, row = 50, 1, '', @orgs.length, 0
 
@@ -57,11 +55,11 @@
             <% if row > 0 %>
               </ul></div>
             <% end %>
-            <div class="<%= (cols == 3 ? 'three' : (cols == 2 ? 'two' : 'one')) %>-column"><ul>
+            <div class="col-md-<%= (cols == 3 ? '4' : (cols == 2 ? '6' : '12')) %>"><ul>
           <% end %>
 
           <% unless org.name[0].capitalize == letter %>
-            <li class="separator"><%= org.name[0].capitalize %></li>
+            <li class="bg-primary"><%= org.name[0].capitalize %></li>
             <% row += 1 %>
             <% letter = org.name[0].capitalize %>
           <% end %>
@@ -74,12 +72,11 @@
   
     <hr />
   
-    <p class="left-indent">
-      <%= _('Institution not in the list?') %>&nbsp;
-      <button type="button" class="btn btn-link" data-toggle="modal" data-target="#header-signin">
-        <%= _('Create an account with any email address')%>
-      </button>
+    <p>
+      <%= _('Institution not in the list?') %>
+      <a href="#header-signin" data-toggle="modal" data-target="#header-signin">
+        <%= _('Create an account with any email address') %>
+      </a>
     </p>
-    <%= render partial: 'shared/signin' %>
   </div>
 </div>
diff --git a/app/views/plans/index.html.erb b/app/views/plans/index.html.erb
index 17657b5..00f1c42 100644
--- a/app/views/plans/index.html.erb
+++ b/app/views/plans/index.html.erb
@@ -20,7 +20,7 @@
   <div class="col-md-12">
     <% if @plans.length > 0 %>
       <div class="table-responsive">
-        <table class="table table-hover tablesorter">
+        <table class="table table-hover tablesorter" id="my-plans">
           <thead>
             <% if @plans.length > TABLE_FILTER_MIN_ROWS %>
               <tr>
diff --git a/app/views/shared/_create_account_form.html.erb b/app/views/shared/_create_account_form.html.erb
index c9d8cba..e493c79 100644
--- a/app/views/shared/_create_account_form.html.erb
+++ b/app/views/shared/_create_account_form.html.erb
@@ -43,8 +43,8 @@
   </div>
   <div class="checkbox">
     <%= f.label(:accept_terms,
-        raw("#{ f.check_box(:accept_terms) } #{_('I accept the')} <a href=\"#{terms_path}\">#{_('terms and conditions')}</a>")) %>
+        raw("#{ f.check_box(:accept_terms, "aria-required": true, "data-validation-error": _('You must agree to the term and conditions.')) } #{_('I accept the')} <a href=\"#{terms_path}\">#{_('terms and conditions')}</a>")) %>
   </div>
   
-  <%= f.button(_('Sign in'), class: "btn btn-default", type: "submit") %>
+  <%= f.button(_('Create account'), class: "btn btn-default", type: "submit") %>
 <% end %>
diff --git a/app/views/shared/_sign_in_form.html.erb b/app/views/shared/_sign_in_form.html.erb
index a542b5e..e032ead 100644
--- a/app/views/shared/_sign_in_form.html.erb
+++ b/app/views/shared/_sign_in_form.html.erb
@@ -22,7 +22,7 @@
     <%= f.email_field(:email, class: 'form-control', "aria-required": true) %>
   </div>
   <div class="checkbox">
-    <%= f.label :remember_me, raw("#{f.check_box :remember_me}#{_('Remember email')}") %>
+    <%= label_tag 'remember_email', raw("#{check_box_tag 'remember_email'}#{_('Remember email')}") %>
   </div>
   <div class="form-group">
     <%= f.label(:password, _('Password'), class: 'control-label') %>
diff --git a/lib/assets/javascripts/utils/ariatiseForm.js b/lib/assets/javascripts/utils/ariatiseForm.js
index 2db61b3..00705a2 100644
--- a/lib/assets/javascripts/utils/ariatiseForm.js
+++ b/lib/assets/javascripts/utils/ariatiseForm.js
@@ -16,6 +16,13 @@
  be run if the field has a value.
    Example: `<input type="email" data-validation="email" />`
 
+ Validation with a custom error message
+ ------------------------
+ To add a custom error message to a field's validation (default messages can be found
+ in the constants.js file) just add a 'data-validation-error' attribute to the field.
+   Example: `<input type="checkbox" name="user_accept_terms" val="0" aria-required="true"
+                    data-validation-error="You must agree to the terms and conditions." />`
+
  Validation for radio buttons
  ------------------------
  To add validation to a set of `radio` buttons, use the rules listed above, 
diff --git a/lib/assets/javascripts/views/orgs/shibboleth_ds.js b/lib/assets/javascripts/views/orgs/shibboleth_ds.js
index b113489..f186b93 100644
--- a/lib/assets/javascripts/views/orgs/shibboleth_ds.js
+++ b/lib/assets/javascripts/views/orgs/shibboleth_ds.js
@@ -11,11 +11,11 @@
 
   $('#show_list').click((e) => {
     e.preventDefault();
-    if ($('#full_list').is('.hide')) {
-      $('#full_list').show();
+    if ($('#full_list').is('.hidden')) {
+      $('#full_list').removeClass('hidden').attr('aria-hidden', 'false');
       $(e.currentTarget).html(SHIBBOLETH_DISCOVERY_SERVICE_HIDE_LIST);
     } else {
-      $('#full_list').hide();
+      $('#full_list').addClass('hidden').attr('aria-hidden', 'true');
       $(e.currentTarget).html(SHIBBOLETH_DISCOVERY_SERVICE_SHOW_LIST);
     }
   });
diff --git a/lib/assets/javascripts/views/plans/index.js b/lib/assets/javascripts/views/plans/index.js
index a504bbb..9124c6b 100644
--- a/lib/assets/javascripts/views/plans/index.js
+++ b/lib/assets/javascripts/views/plans/index.js
@@ -24,7 +24,7 @@
     });
   };
 
-  $("input[type='checkbox']").on('click, change', (e) => {
+  $("#my-plans input[type='checkbox']").on('click, change', (e) => {
     checkboxHandler(e.currentTarget);
   });
 });
diff --git a/lib/assets/javascripts/views/shared/sign_in_form.js b/lib/assets/javascripts/views/shared/sign_in_form.js
index baac16e..f265b67 100644
--- a/lib/assets/javascripts/views/shared/sign_in_form.js
+++ b/lib/assets/javascripts/views/shared/sign_in_form.js
@@ -1,7 +1,32 @@
+import * as Cookies from 'js-cookie';
 import ariatiseForm from '../../utils/ariatiseForm';
 import { togglisePasswords } from '../../utils/passwordHelper';
 
 $(() => {
   ariatiseForm({ selector: '#sign_in_form' });
   togglisePasswords({ selector: '#sign_in_form' });
+
+  const email = Cookies.get('dmproadmap_email');
+
+  // If the user's email was stored in the browser's cookies the pre-populate the field
+  if (email && email !== '') {
+    $('#sign_in_form #remember_email').attr('checked', 'checked');
+    $('#sign_in_form #user_email').val(email);
+  }
+
+  // When the user checks the 'remember email' box store the value in the browser storage
+  $('#sign_in_form #remember_email').click((e) => {
+    if ($(e.currentTarget).is(':checked')) {
+      Cookies.set('dmproadmap_email', $('#sign_in_form #user_email').val(), { expires: 14 });
+    } else {
+      Cookies.remove('dmproadmap_email');
+    }
+  });
+
+  // If the email is changed and the user has asked to remember it update the browser storage
+  $('#sign_in_form #user_email').change((e) => {
+    if ($('#sign_in_form #remember_email').is(':checked')) {
+      Cookies.set('dmproadmap_email', $(e.currentTarget).val(), { expires: 14 });
+    }
+  });
 });
diff --git a/lib/assets/package-lock.json b/lib/assets/package-lock.json
index d43dad4..fdd4011 100644
--- a/lib/assets/package-lock.json
+++ b/lib/assets/package-lock.json
@@ -4676,6 +4676,11 @@
       "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=",
       "dev": true
     },
+    "js-cookie": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.1.4.tgz",
+      "integrity": "sha1-2k7FA4ZvFJ0WTPJfV57zEBUCXY0="
+    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
diff --git a/lib/assets/package.json b/lib/assets/package.json
index 21e1786..47fcbdc 100644
--- a/lib/assets/package.json
+++ b/lib/assets/package.json
@@ -24,6 +24,7 @@
     "jquery-accessible-autocomplete-list-aria": "1.5.5",
     "jquery-ui-dist": "1.12.1",
     "jquery-ujs": "1.2.2",
+    "js-cookie": "2.1.4",
     "placeholder": "1.0.2",
     "tablesorter": "2.28.15",
     "timeago": "1.6.1",