diff --git a/app/views/shared/_sign_in_form.html.erb b/app/views/shared/_sign_in_form.html.erb
index a049605..5f48dcd 100644
--- a/app/views/shared/_sign_in_form.html.erb
+++ b/app/views/shared/_sign_in_form.html.erb
@@ -7,14 +7,14 @@
<%= f.label(:password, _('Password'), class: 'control-label') %>
<%= f.password_field(:password, class: 'form-control', "aria-required": true) %>
+
+ <%= link_to _('Forgot password?'), new_password_path('user') %>
+
<%= label_tag 'remember_email', raw("#{check_box_tag 'remember_email'}#{_('Remember email')}") %>
<%= f.button(_('Sign in'), class: "btn btn-default", type: "submit") %>
-
- <%= link_to _('Forgot password?'), new_password_path('user') %>
-
-
+
<% if Rails.application.config.shibboleth_enabled %>
- <%= _('or') %> -